The patch titled Subject: printk/nmi: Remove the questionable CONFIG_NEED_PRINTK_NMI has been added to the -mm tree. Its filename is printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2.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: Petr Mladek <pmladek@xxxxxxxx> Subject: printk/nmi: Remove the questionable CONFIG_NEED_PRINTK_NMI The flag NEED_PRINTK_NMI was added because of Arm. It used the NMI safe backtrace implementation on all Arm systems. But it did not have a real NMI handling on CPU_V7M. It seems that it causes more confusion than good. Let's use HAVE_NMI on all arm systems and get rid of the problematic flag. Signed-off-by: Petr Mladek <pmladek@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/Kconfig | 3 --- arch/arm/Kconfig | 3 +-- init/Kconfig | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff -puN arch/Kconfig~printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2 arch/Kconfig --- a/arch/Kconfig~printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2 +++ a/arch/Kconfig @@ -190,9 +190,6 @@ config HAVE_KPROBES_ON_FTRACE config HAVE_NMI bool -config NEED_PRINTK_NMI - bool - config HAVE_NMI_WATCHDOG depends on HAVE_NMI bool diff -puN arch/arm/Kconfig~printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2 arch/arm/Kconfig --- a/arch/arm/Kconfig~printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2 +++ a/arch/arm/Kconfig @@ -64,8 +64,7 @@ config ARM select HAVE_KRETPROBES if (HAVE_KPROBES) select HAVE_MEMBLOCK select HAVE_MOD_ARCH_SPECIFIC - select HAVE_NMI if (!CPU_V7M) - select NEED_PRINTK_NMI if (CPU_V7M) + select HAVE_NMI select HAVE_OPROFILE if (HAVE_PERF_EVENTS) select HAVE_OPTPROBES if !THUMB2_KERNEL select HAVE_PERF_EVENTS diff -puN init/Kconfig~printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2 init/Kconfig --- a/init/Kconfig~printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2 +++ a/init/Kconfig @@ -1481,7 +1481,7 @@ config PRINTK config PRINTK_NMI def_bool y depends on PRINTK - depends on HAVE_NMI || NEED_PRINTK_NMI + depends on HAVE_NMI config BUG bool "BUG() support" if EXPERT _ Patches currently in -mm which might be from pmladek@xxxxxxxx are printk-nmi-generic-solution-for-safe-printk-in-nmi.patch printk-nmi-generic-solution-for-safe-printk-in-nmi-v4.patch printk-nmi-use-irq-work-only-when-ready.patch printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix.patch printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2.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