Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9c40d25 authored by Minfei Huang's avatar Minfei Huang Committed by Ingo Molnar
Browse files

x86/kexec: Remove obsolete 'in_crash_kexec' flag 



Previously, UV NMI used the 'in_crash_kexec' flag to determine whether
we are in a kdump kernel or not:

  5edd19af ("x86, UV: Make kdump avoid stack dumps")

But this flags was removed in the following commit:

  9c48f1c6 ("x86, nmi: Wire up NMI handlers to new routines")

Since it isn't used any more, remove it.

Signed-off-by: default avatarMinfei Huang <mnfhuang@gmail.com>
Acked-by: default avatarDon Zickus <dzickus@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: cpw@sgi.com
Cc: kexec@lists.infradead.org
Cc: mhuang@redhat.com
Link: http://lkml.kernel.org/r/1444070155-17934-1-git-send-email-mhuang@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 25cb62b7

arch/x86/include/asm/kdebug.h

+0 −6
Original line number Diff line number Diff line
@@ -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 */

arch/x86/kernel/crash.c

+0 −3
Original line number Diff line number Diff line
@@ -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();