From: Chris Mason <mason@suse.com>
To: linux-kernel@vger.kernel.org, akpm@osdl.org, mmlnx@us.ibm.com,
"Eric W. Biederman" <ebiederm@xmission.com>
Subject: [PATCH] fix kexec asm
Date: Tue, 7 Mar 2006 21:35:15 -0500 [thread overview]
Message-ID: <200603072135.16116.mason@suse.com> (raw)
From: Michael Matz <matz@suse.de>
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 below fixes a few problems with the kexec inline asm.
Signed-off-by: Chris Mason <mason@suse.com>
---
diff -urp linux-2.6.15.suse/arch/i386/kernel/machine_kexec.c linux-2.6.15/arch/i386/kernel/machine_kexec.c
--- linux-2.6.15.suse/arch/i386/kernel/machine_kexec.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.15/arch/i386/kernel/machine_kexec.c 2006-02-08 04:19:13.000000000 +0100
@@ -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
}
diff -urp linux-2.6.15.suse/arch/x86_64/kernel/machine_kexec.c linux-2.6.15/arch/x86_64/kernel/machine_kexec.c
--- linux-2.6.15.suse/arch/x86_64/kernel/machine_kexec.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.15/arch/x86_64/kernel/machine_kexec.c 2006-02-08 04:21:13.000000000 +0100
@@ -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"
);
}
diff -urp linux-2.6.15.suse/include/asm-powerpc/kexec.h linux-2.6.15/include/asm-powerpc/kexec.h
--- linux-2.6.15.suse/include/asm-powerpc/kexec.h 2006-02-08 04:10:24.000000000 +0100
+++ linux-2.6.15/include/asm-powerpc/kexec.h 2006-02-08 04:31:15.000000000 +0100
@@ -93,7 +93,8 @@ static inline void crash_setup_regs(stru
"mfxer %0\n"
"std %0, 296(%2)\n"
: "=&r" (tmp1), "=&r" (tmp2)
- : "b" (newregs));
+ : "b" (newregs)
+ : "memory");
}
}
#else
next reply other threads:[~2006-03-08 2:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-08 2:35 Chris Mason [this message]
2006-03-08 4:16 ` [PATCH] fix kexec asm Eric W. Biederman
2006-03-09 9:35 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200603072135.16116.mason@suse.com \
--to=mason@suse.com \
--cc=akpm@osdl.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mmlnx@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.