Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ec5e3a8 authored by Michael Matz's avatar Michael Matz Committed by Linus Torvalds
Browse files

[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: default avatarChris Mason <mason@suse.com>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 62287fbb

arch/i386/kernel/machine_kexec.c

+7 −7
Original line number Diff line number Diff line
@@ -116,13 +116,13 @@ static void load_segments(void) 
	__asm__ __volatile__ (

		"\tljmp $"STR(__KERNEL_CS)",$1f\n"

		"\t1:\n"

		"\tmovl $"STR(__KERNEL_DS)",%eax\n"

		"\tmovl %eax,%ds\n"

		"\tmovl %eax,%es\n"

		"\tmovl %eax,%fs\n"

		"\tmovl %eax,%gs\n"

		"\tmovl %eax,%ss\n"

		);

		"\tmovl $"STR(__KERNEL_DS)",%%eax\n"

		"\tmovl %%eax,%%ds\n"

		"\tmovl %%eax,%%es\n"

		"\tmovl %%eax,%%fs\n"

		"\tmovl %%eax,%%gs\n"

		"\tmovl %%eax,%%ss\n"

		::: "eax", "memory");

#undef STR

#undef __STR

}

arch/x86_64/kernel/machine_kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

		);

}

include/asm-powerpc/kexec.h

+2 −1
Original line number Diff line number Diff line
@@ -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