summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Matz <matz@suse.de>2006-03-07 21:55:48 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-08 14:15:04 -0800
commit2ec5e3a867d63d04932e11c6097f63760d9be3fe (patch)
treebb3ea7b72232ec127a104c37cce0f17881ad5d28 /include
parent62287fbb54b4af71dc5a4918350f81a4cd467788 (diff)
[PATCH] fix kexec asm
While testing kexec and kdump we hit problems where the new kernel would freeze or instantly reboot. The easiest way to trigger it was to kexec a kernel compiled for CONFIG_M586 on an athlon cpu. Compiling for CONFIG_MK7 instead would work fine. The patch fixes a few problems with the kexec inline asm. Signed-off-by: Chris Mason <mason@suse.com> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/kexec.h3
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