AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] fix kexec asm

Browse Source 
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>
This commit is contained in:
Michael Matz 2006-03-07 21:55:48 -08:00 committed by Linus Torvalds
parent 62287fbb54
commit 2ec5e3a867
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/i386/kernel/machine_kexec.c
View File

@ -116,13 +116,13 @@ static void load_segments(void)
__asm__ __volatile__ ( __asm__ __volatile__ (
"\tljmp $"STR(__KERNEL_CS)",$1f\n" "\tljmp $"STR(__KERNEL_CS)",$1f\n"
"\t1:\n" "\t1:\n"
"\tmovl $"STR(__KERNEL_DS)",%eax\n" "\tmovl $"STR(__KERNEL_DS)",%%eax\n"
"\tmovl %eax,%ds\n" "\tmovl %%eax,%%ds\n"
"\tmovl %eax,%es\n" "\tmovl %%eax,%%es\n"
"\tmovl %eax,%fs\n" "\tmovl %%eax,%%fs\n"
"\tmovl %eax,%gs\n" "\tmovl %%eax,%%gs\n"
"\tmovl %eax,%ss\n" "\tmovl %%eax,%%ss\n"
); ::: "eax", "memory");
#undef STR #undef STR
#undef __STR #undef __STR
} }

2
arch/x86_64/kernel/machine_kexec.c
View File

@ -140,7 +140,7 @@ static void load_segments(void)
"\tmovl %0,%%ss\n" "\tmovl %0,%%ss\n"
"\tmovl %0,%%fs\n" "\tmovl %0,%%fs\n"
"\tmovl %0,%%gs\n" "\tmovl %0,%%gs\n"
: : "a" (__KERNEL_DS) : : "a" (__KERNEL_DS) : "memory"
); );
} }

3
include/asm-powerpc/kexec.h
View File

@ -93,7 +93,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
"mfxer %0\n" "mfxer %0\n"
"std %0, 296(%2)\n" "std %0, 296(%2)\n"
: "=&r" (tmp1), "=&r" (tmp2) : "=&r" (tmp1), "=&r" (tmp2)
: "b" (newregs)); : "b" (newregs)
: "memory");
} }
} }
#else #else