UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2015-11-03 19:28:37 -08:00
parent a75a3f6fc9 e9c40d257f
commit 378e4e9825
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/include/asm/kdebug.h
View File

@ -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 */

3
arch/x86/kernel/crash.c
View File

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