From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751714AbbJLHqV (ORCPT ); Mon, 12 Oct 2015 03:46:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42017 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308AbbJLHqT (ORCPT ); Mon, 12 Oct 2015 03:46:19 -0400 Date: Mon, 12 Oct 2015 00:45:35 -0700 From: tip-bot for Minfei Huang Message-ID: Cc: tglx@linutronix.de, dzickus@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, mingo@kernel.org, mnfhuang@gmail.com, linux-kernel@vger.kernel.org, peterz@infradead.org Reply-To: dzickus@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, mnfhuang@gmail.com, peterz@infradead.org, tglx@linutronix.de In-Reply-To: <1444070155-17934-1-git-send-email-mhuang@redhat.com> References: <1444070155-17934-1-git-send-email-mhuang@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/kexec: Remove obsolete 'in_crash_kexec' flag Git-Commit-ID: e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d Gitweb: http://git.kernel.org/tip/e9c40d257fdd58c5cc97d3fe3aa141dd23ee5e9d Author: Minfei Huang AuthorDate: Tue, 6 Oct 2015 02:35:55 +0800 Committer: Ingo Molnar 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 Acked-by: Don Zickus Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner 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 --- 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();