Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / include / asm / kexec.h

diff --git a/arch/arm/include/asm/kexec.h b/arch/arm/include/asm/kexec.h
index 8ec9ef5c3c7be25a2705451e8aab0a8205a47e67..c0094d8edae45c1d331b0ec6a63a0105ee8a109a 100644 (file)
--- a/arch/arm/include/asm/kexec.h
+++ b/arch/arm/include/asm/kexec.h
@@ -33,10 +33,20 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
        if (oldregs) {
                memcpy(newregs, oldregs, sizeof(*newregs));
        } else {
-               __asm__ __volatile__ ("stmia %0, {r0 - r15}"
-                                     : : "r" (&newregs->ARM_r0));
-               __asm__ __volatile__ ("mrs %0, cpsr"
-                                     : "=r" (newregs->ARM_cpsr));
+               __asm__ __volatile__ (
+                       "stmia  %[regs_base], {r0-r12}\n\t"
+                       "mov    %[_ARM_sp], sp\n\t"
+                       "str    lr, %[_ARM_lr]\n\t"
+                       "adr    %[_ARM_pc], 1f\n\t"
+                       "mrs    %[_ARM_cpsr], cpsr\n\t"
+               "1:"
+                       : [_ARM_pc] "=r" (newregs->ARM_pc),
+                         [_ARM_cpsr] "=r" (newregs->ARM_cpsr),
+                         [_ARM_sp] "=r" (newregs->ARM_sp),
+                         [_ARM_lr] "=o" (newregs->ARM_lr)
+                       : [regs_base] "r" (&newregs->ARM_r0)
+                       : "memory"
+               );
        }
 }