Skip to content

Commit e9c40d2

Browse files
Minfei HuangIngo Molnar
authored andcommitted
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: 5edd19a ("x86, UV: Make kdump avoid stack dumps") But this flags was removed in the following commit: 9c48f1c ("x86, nmi: Wire up NMI handlers to new routines") Since it isn't used any more, remove it. Signed-off-by: Minfei Huang <mnfhuang@gmail.com> Acked-by: Don 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: Ingo Molnar <mingo@kernel.org>
1 parent 25cb62b commit e9c40d2

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

arch/x86/include/asm/kdebug.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,5 @@ extern void show_trace(struct task_struct *t, struct pt_regs *regs,
2929
extern void __show_regs(struct pt_regs *regs, int all);
3030
extern unsigned long oops_begin(void);
3131
extern void oops_end(unsigned long, struct pt_regs *, int signr);
32-
#ifdef CONFIG_KEXEC_CORE
33-
extern int in_crash_kexec;
34-
#else
35-
/* no crash dump is ever in progress if no crash kernel can be kexec'd */
36-
#define in_crash_kexec 0
37-
#endif
3832

3933
#endif /* _ASM_X86_KDEBUG_H */

arch/x86/kernel/crash.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ struct crash_memmap_data {
7575
unsigned int type;
7676
};
7777

78-
int in_crash_kexec;
79-
8078
/*
8179
* This is used to VMCLEAR all VMCSs loaded on the
8280
* processor. And when loading kvm_intel module, the
@@ -132,7 +130,6 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
132130

133131
static void kdump_nmi_shootdown_cpus(void)
134132
{
135-
in_crash_kexec = 1;
136133
nmi_shootdown_cpus(kdump_nmi_callback);
137134

138135
disable_local_APIC();

0 commit comments

Comments
 (0)