Commit 378e4e98 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 boot cleanup from Ingo Molnar:
 "A single commit: remove an obsolete kcrash boot flag"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kexec: Remove obsolete 'in_crash_kexec' flag
parents a75a3f6f e9c40d25
...@@ -29,11 +29,5 @@ extern void show_trace(struct task_struct *t, struct pt_regs *regs, ...@@ -29,11 +29,5 @@ extern void show_trace(struct task_struct *t, struct pt_regs *regs,
extern void __show_regs(struct pt_regs *regs, int all); extern void __show_regs(struct pt_regs *regs, int all);
extern unsigned long oops_begin(void); extern unsigned long oops_begin(void);
extern void oops_end(unsigned long, struct pt_regs *, int signr); extern void oops_end(unsigned long, struct pt_regs *, int signr);
#ifdef CONFIG_KEXEC_CORE
extern int in_crash_kexec;
#else
/* no crash dump is ever in progress if no crash kernel can be kexec'd */
#define in_crash_kexec 0
#endif
#endif /* _ASM_X86_KDEBUG_H */ #endif /* _ASM_X86_KDEBUG_H */
...@@ -75,8 +75,6 @@ struct crash_memmap_data { ...@@ -75,8 +75,6 @@ struct crash_memmap_data {
unsigned int type; unsigned int type;
}; };
int in_crash_kexec;
/* /*
* This is used to VMCLEAR all VMCSs loaded on the * This is used to VMCLEAR all VMCSs loaded on the
* processor. And when loading kvm_intel module, the * processor. And when loading kvm_intel module, the
...@@ -132,7 +130,6 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs) ...@@ -132,7 +130,6 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
static void kdump_nmi_shootdown_cpus(void) static void kdump_nmi_shootdown_cpus(void)
{ {
in_crash_kexec = 1;
nmi_shootdown_cpus(kdump_nmi_callback); nmi_shootdown_cpus(kdump_nmi_callback);
disable_local_APIC(); disable_local_APIC();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment