Skip to contentSkip to conversation

kexec: Remove obsolete flag 'in_crash_kexec'

PATCH In review Minfei Huang 3 participants 3 messages Oct 5, 2015 – Oct 12, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kexec: Remove obsolete flag 'in_crash_kexec'

From: Minfei Huang <[email protected]>

Previously, UV NMI used 'in_crash_kexec' flag to be sure that we are in kdump kernel or not in commit 5edd19af18a36a4e22c570b1b969179e0ca1fe4c ("x86, UV: Make kdump avoid stack dumps"). But this flags is removed in commit 9c48f1c629ecfa114850c03f875c6691003214de ("x86, nmi: Wire up NMI handlers to new routines").

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

---
 arch/x86/include/asm/kdebug.h | 6 ------
 arch/x86/kernel/crash.c       | 3 ---
 2 files changed, 9 deletions(-)
arch/x86/include/asm/kdebug.h +0 -6
index b130d59..e5f5dc9 100644
@@ -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
index 74ca2fe..2c1910f 100644
@@ -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();
Signature · 1 line
2.4.0
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Minfei Huang

From: Minfei Huang <[email protected]>

Previously, UV NMI used 'in_crash_kexec' flag to be sure that we are in kdump kernel or not in commit 5edd19af18a36a4e22c570b1b969179e0ca1fe4c ("x86, UV: Make kdump avoid stack dumps"). But this flags is removed in commit 9c48f1c629ecfa114850c03f875c6691003214de ("x86, nmi: Wire up NMI handlers to new routines").

Sounds right.

Quoted 49 lines

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

---
 arch/x86/include/asm/kdebug.h | 6 ------
 arch/x86/kernel/crash.c       | 3 ---
 2 files changed, 9 deletions(-)
arch/x86/include/asm/kdebug.h +0 -6
index b130d59..e5f5dc9 100644
@@ -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
index 74ca2fe..2c1910f 100644
@@ -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();
Signature · 1 line
2.4.0
#2 lore raw

[tip:x86/boot] x86/kexec: Remove obsolete 'in_crash_kexec' flag

In reply to Minfei Huang
x86/kexec: Remove obsolete 'in_crash_kexec' flag
Commit-ID:  e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d
Gitweb:     http://git.kernel.org/tip/e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d
Author:     Minfei Huang <[email protected]>
AuthorDate: Tue, 6 Oct 2015 02:35:55 +0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 12 Oct 2015 09:43:11 +0200

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.

---
 arch/x86/include/asm/kdebug.h | 6 ------
 arch/x86/kernel/crash.c       | 3 ---
 2 files changed, 9 deletions(-)
arch/x86/include/asm/kdebug.h +0 -6
index b130d59..e5f5dc9 100644
@@ -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
index 74ca2fe..2c1910f 100644
@@ -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();