diff options
author | Minfei Huang <mnfhuang@gmail.com> | 2015-10-05 14:35:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-10-12 03:43:11 -0400 |
commit | e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d (patch) | |
tree | 51013c541d5d780cfbc7bf151cb708637f74be9a | |
parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) |
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:
5edd19af18a36a4 ("x86, UV: Make kdump avoid stack dumps")
But this flags was removed in the following commit:
9c48f1c629ecfa1 ("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>
-rw-r--r-- | arch/x86/include/asm/kdebug.h | 6 | ||||
-rw-r--r-- | arch/x86/kernel/crash.c | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h index b130d59406fb..e5f5dc9787d5 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, | |||
29 | extern void __show_regs(struct pt_regs *regs, int all); | 29 | extern void __show_regs(struct pt_regs *regs, int all); |
30 | extern unsigned long oops_begin(void); | 30 | extern unsigned long oops_begin(void); |
31 | extern void oops_end(unsigned long, struct pt_regs *, int signr); | 31 | 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 | ||
38 | 32 | ||
39 | #endif /* _ASM_X86_KDEBUG_H */ | 33 | #endif /* _ASM_X86_KDEBUG_H */ |
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 74ca2fe7a0b3..2c1910f6717e 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
@@ -75,8 +75,6 @@ struct crash_memmap_data { | |||
75 | unsigned int type; | 75 | unsigned int type; |
76 | }; | 76 | }; |
77 | 77 | ||
78 | int in_crash_kexec; | ||
79 | |||
80 | /* | 78 | /* |
81 | * This is used to VMCLEAR all VMCSs loaded on the | 79 | * This is used to VMCLEAR all VMCSs loaded on the |
82 | * processor. And when loading kvm_intel module, the | 80 | * processor. And when loading kvm_intel module, the |
@@ -132,7 +130,6 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs) | |||
132 | 130 | ||
133 | static void kdump_nmi_shootdown_cpus(void) | 131 | static void kdump_nmi_shootdown_cpus(void) |
134 | { | 132 | { |
135 | in_crash_kexec = 1; | ||
136 | nmi_shootdown_cpus(kdump_nmi_callback); | 133 | nmi_shootdown_cpus(kdump_nmi_callback); |
137 | 134 | ||
138 | disable_local_APIC(); | 135 | disable_local_APIC(); |