On Tue, Oct 06, 2015 at 02:35:55AM +0800, Minfei Huang wrote: > From: Minfei Huang <mnfhuang at gmail.com> > > Previously, UV NMI used 'in_crash_kexec' flag to be sure that we are in > kdump kernel or not in commit 5edd19af18a36a4e22c570b1b969179e0ca1fe4c > ("x86, UV: Make kdump avoid stack dumps"). But this flags is removed in > commit 9c48f1c629ecfa114850c03f875c6691003214de ("x86, nmi: Wire up NMI > handlers to new routines"). Sounds right. Acked-by: Don Zickus <dzickus at redhat.com> > > Since it isn't used any more, remove it. > > Signed-off-by: Minfei Huang <mnfhuang at gmail.com> > --- > arch/x86/include/asm/kdebug.h | 6 ------ > arch/x86/kernel/crash.c | 3 --- > 2 files changed, 9 deletions(-) > > diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h > index b130d59..e5f5dc9 100644 > --- a/arch/x86/include/asm/kdebug.h > +++ b/arch/x86/include/asm/kdebug.h > @@ -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 unsigned long oops_begin(void); > 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 */ > diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c > index 74ca2fe..2c1910f 100644 > --- a/arch/x86/kernel/crash.c > +++ b/arch/x86/kernel/crash.c > @@ -75,8 +75,6 @@ struct crash_memmap_data { > unsigned int type; > }; > > -int in_crash_kexec; > - > /* > * This is used to VMCLEAR all VMCSs loaded on the > * processor. And when loading kvm_intel module, the > @@ -132,7 +130,6 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs) > > static void kdump_nmi_shootdown_cpus(void) > { > - in_crash_kexec = 1; > nmi_shootdown_cpus(kdump_nmi_callback); > > disable_local_APIC(); > -- > 2.4.0 >