Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h
index bda2f217e6fe..6a2af2f6853b 100644
--- a/include/asm-powerpc/kexec.h
+++ b/include/asm-powerpc/kexec.h
@@ -93,7 +93,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
                         "mfxer  %0\n"
                         "std    %0, 296(%2)\n"
                         : "=&r" (tmp1), "=&r" (tmp2)
-                        : "b" (newregs));
+                        : "b" (newregs)
+                        : "memory");
         }
 }
 #else