mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-13 09:20:17 +00:00
x86: fix CONFIG_KEXEC build breakage
X86_32 build fix to commit 62a31a03b3d2a9d20e7a073e2cd9b27bfb7d6a3f Signed-off-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
c9927c2bf4
commit
1fb473d8f4
@ -25,7 +25,7 @@
|
||||
#include <linux/kdebug.h>
|
||||
#include <asm/smp.h>
|
||||
|
||||
#ifdef X86_32
|
||||
#ifdef CONFIG_X86_32
|
||||
#include <mach_ipi.h>
|
||||
#else
|
||||
#include <asm/mach_apic.h>
|
||||
@ -41,7 +41,7 @@ static int crash_nmi_callback(struct notifier_block *self,
|
||||
unsigned long val, void *data)
|
||||
{
|
||||
struct pt_regs *regs;
|
||||
#ifdef X86_32
|
||||
#ifdef CONFIG_X86_32
|
||||
struct pt_regs fixed_regs;
|
||||
#endif
|
||||
int cpu;
|
||||
@ -60,7 +60,7 @@ static int crash_nmi_callback(struct notifier_block *self,
|
||||
return NOTIFY_STOP;
|
||||
local_irq_disable();
|
||||
|
||||
#ifdef X86_32
|
||||
#ifdef CONFIG_X86_32
|
||||
if (!user_mode_vm(regs)) {
|
||||
crash_fixup_ss_esp(&fixed_regs, regs);
|
||||
regs = &fixed_regs;
|
||||
|
Loading…
x
Reference in New Issue
Block a user