From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751256AbbJESfO (ORCPT ); Mon, 5 Oct 2015 14:35:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40440 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750798AbbJESfM (ORCPT ); Mon, 5 Oct 2015 14:35:12 -0400 From: Minfei Huang To: dzickus@redhat.com, cpw@sgi.com, akpm@linux-foundation.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, mhuang@redhat.com, Minfei Huang Subject: [PATCH] kexec: Remove obsolete flag 'in_crash_kexec' Date: Tue, 6 Oct 2015 02:35:55 +0800 Message-Id: <1444070155-17934-1-git-send-email-mhuang@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Minfei Huang 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. Signed-off-by: Minfei Huang --- 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(); -- 2.4.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZjAbl-0006Jk-FZ for kexec@lists.infradead.org; Mon, 05 Oct 2015 18:35:34 +0000 From: Minfei Huang Subject: [PATCH] kexec: Remove obsolete flag 'in_crash_kexec' Date: Tue, 6 Oct 2015 02:35:55 +0800 Message-Id: <1444070155-17934-1-git-send-email-mhuang@redhat.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: dzickus@redhat.com, cpw@sgi.com, akpm@linux-foundation.org, tglx@linutronix.de Cc: mhuang@redhat.com, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Minfei Huang From: Minfei Huang 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. Signed-off-by: Minfei Huang --- 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(); -- 2.4.0 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec