mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-16 11:38:11 +00:00
x86: fix CONFIG_KEXEC build breakage
X86_32 build fix to commit 62a31a03b3
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
1 changed files with 3 additions and 3 deletions
|
@ -25,7 +25,7 @@
|
||||||
#include <linux/kdebug.h>
|
#include <linux/kdebug.h>
|
||||||
#include <asm/smp.h>
|
#include <asm/smp.h>
|
||||||
|
|
||||||
#ifdef X86_32
|
#ifdef CONFIG_X86_32
|
||||||
#include <mach_ipi.h>
|
#include <mach_ipi.h>
|
||||||
#else
|
#else
|
||||||
#include <asm/mach_apic.h>
|
#include <asm/mach_apic.h>
|
||||||
|
@ -41,7 +41,7 @@ static int crash_nmi_callback(struct notifier_block *self,
|
||||||
unsigned long val, void *data)
|
unsigned long val, void *data)
|
||||||
{
|
{
|
||||||
struct pt_regs *regs;
|
struct pt_regs *regs;
|
||||||
#ifdef X86_32
|
#ifdef CONFIG_X86_32
|
||||||
struct pt_regs fixed_regs;
|
struct pt_regs fixed_regs;
|
||||||
#endif
|
#endif
|
||||||
int cpu;
|
int cpu;
|
||||||
|
@ -60,7 +60,7 @@ static int crash_nmi_callback(struct notifier_block *self,
|
||||||
return NOTIFY_STOP;
|
return NOTIFY_STOP;
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
|
|
||||||
#ifdef X86_32
|
#ifdef CONFIG_X86_32
|
||||||
if (!user_mode_vm(regs)) {
|
if (!user_mode_vm(regs)) {
|
||||||
crash_fixup_ss_esp(&fixed_regs, regs);
|
crash_fixup_ss_esp(&fixed_regs, regs);
|
||||||
regs = &fixed_regs;
|
regs = &fixed_regs;
|
||||||
|
|
Loading…
Add table
Reference in a new issue