[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d@git.kernel.org>
Date: Mon, 12 Oct 2015 00:45:35 -0700
From: tip-bot for Minfei Huang <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, dzickus@...hat.com, hpa@...or.com,
torvalds@...ux-foundation.org, mingo@...nel.org,
mnfhuang@...il.com, linux-kernel@...r.kernel.org,
peterz@...radead.org
Subject: [tip:x86/boot] x86/kexec: Remove obsolete 'in_crash_kexec' flag
Commit-ID: e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d
Gitweb: http://git.kernel.org/tip/e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d
Author: Minfei Huang <mnfhuang@...il.com>
AuthorDate: Tue, 6 Oct 2015 02:35:55 +0800
Committer: Ingo Molnar <mingo@...nel.org>
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.
Signed-off-by: Minfei Huang <mnfhuang@...il.com>
Acked-by: Don Zickus <dzickus@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: cpw@....com
Cc: kexec@...ts.infradead.org
Cc: mhuang@...hat.com
Link: http://lkml.kernel.org/r/1444070155-17934-1-git-send-email-mhuang@redhat.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/include/asm/kdebug.h | 6 ------
arch/x86/kernel/crash.c | 3 ---
2 files changed, 9 deletions(-)
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h
index b130d59..e5f5dc9 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,
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 */
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 74ca2fe..2c1910f 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -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();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists