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

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

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();