summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorMichael Matz <matz@suse.de>2006-03-08 06:55:48 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-08 23:15:04 +0100
commit2ec5e3a867d63d04932e11c6097f63760d9be3fe (patch)
treebb3ea7b72232ec127a104c37cce0f17881ad5d28 /arch/x86_64/kernel
parent[PATCH] dac960: add disk entropy in request completions (diff)
downloadlinux-2ec5e3a867d63d04932e11c6097f63760d9be3fe.tar.xz
linux-2ec5e3a867d63d04932e11c6097f63760d9be3fe.zip
[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 'arch/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/machine_kexec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/machine_kexec.c b/arch/x86_64/kernel/machine_kexec.c
index 89fab51e20f4..25ac8a3faae6 100644
--- a/arch/x86_64/kernel/machine_kexec.c
+++ b/arch/x86_64/kernel/machine_kexec.c
@@ -140,7 +140,7 @@ static void load_segments(void)
"\tmovl %0,%%ss\n"
"\tmovl %0,%%fs\n"
"\tmovl %0,%%gs\n"
- : : "a" (__KERNEL_DS)
+ : : "a" (__KERNEL_DS) : "memory"
);
}