The patch titled Subject: kexec: Remove obsolete flag 'in_crash_kexec' has been added to the -mm tree. Its filename is kexec-remove-obsolete-flag-in_crash_kexec.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/kexec-remove-obsolete-flag-in_crash_kexec.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/kexec-remove-obsolete-flag-in_crash_kexec.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Minfei Huang <mnfhuang@xxxxxxxxx> Subject: kexec: Remove obsolete flag 'in_crash_kexec' Previously, UV NMI used 'in_crash_kexec' flag to be sure that we are in kdump kernel or not in commit 5edd19af18a36a4e ("x86, UV: Make kdump avoid stack dumps"). But this flags is removed in commit 9c48f1c629ecfa114850c0 ("x86, nmi: Wire up NMI handlers to new routines"). Since it isn't used any more, remove it. Signed-off-by: Minfei Huang <mnfhuang@xxxxxxxxx> Acked-by: Don Zickus <dzickus@xxxxxxxxxx> Cc: Eric Biederman <ebiederm@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/include/asm/kdebug.h | 6 ------ arch/x86/kernel/crash.c | 3 --- 2 files changed, 9 deletions(-) diff -puN arch/x86/include/asm/kdebug.h~kexec-remove-obsolete-flag-in_crash_kexec arch/x86/include/asm/kdebug.h --- a/arch/x86/include/asm/kdebug.h~kexec-remove-obsolete-flag-in_crash_kexec +++ a/arch/x86/include/asm/kdebug.h @@ -29,11 +29,5 @@ extern void show_trace(struct task_struc 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 -puN arch/x86/kernel/crash.c~kexec-remove-obsolete-flag-in_crash_kexec arch/x86/kernel/crash.c --- a/arch/x86/kernel/crash.c~kexec-remove-obsolete-flag-in_crash_kexec +++ a/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, static void kdump_nmi_shootdown_cpus(void) { - in_crash_kexec = 1; nmi_shootdown_cpus(kdump_nmi_callback); disable_local_APIC(); _ Patches currently in -mm which might be from mnfhuang@xxxxxxxxx are kexec-use-file-name-as-the-output-message-prefix.patch kexec-remove-obsolete-flag-in_crash_kexec.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html