The patch titled Subject: xtensa: replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC has been added to the -mm tree. Its filename is xtensa-replace-config_debug_kernel-with-config_debug_misc.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/xtensa-replace-config_debug_kernel-with-config_debug_misc.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/xtensa-replace-config_debug_kernel-with-config_debug_misc.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/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Sinan Kaya <okaya@xxxxxxxxxx> Subject: xtensa: replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC CONFIG_DEBUG_KERNEL should not impact code generation. Use the newly defined CONFIG_DEBUG_MISC instead to keep the current code. Link: http://lkml.kernel.org/r/20190413224438.10802-5-okaya@xxxxxxxxxx Signed-off-by: Sinan Kaya <okaya@xxxxxxxxxx> Reviewed-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> Acked-by: Max Filippov <jcmvbkbc@xxxxxxxxx> Cc: Chris Zankel <chris@xxxxxxxxxx> Cc: Anders Roxell <anders.roxell@xxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Christophe Leroy <christophe.leroy@xxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Florian Westphal <fw@xxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: James Hogan <jhogan@xxxxxxxxxx> Cc: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx> Cc: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Cc: Paul Burton <paul.burton@xxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Thomas Bogendoerfer <tbogendoerfer@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/xtensa/include/asm/irqflags.h | 2 +- arch/xtensa/kernel/smp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/arch/xtensa/include/asm/irqflags.h~xtensa-replace-config_debug_kernel-with-config_debug_misc +++ a/arch/xtensa/include/asm/irqflags.h @@ -27,7 +27,7 @@ static inline unsigned long arch_local_i { unsigned long flags; #if XTENSA_FAKE_NMI -#if defined(CONFIG_DEBUG_KERNEL) && (LOCKLEVEL | TOPLEVEL) >= XCHAL_DEBUGLEVEL +#if defined(CONFIG_DEBUG_MISC) && (LOCKLEVEL | TOPLEVEL) >= XCHAL_DEBUGLEVEL unsigned long tmp; asm volatile("rsr %0, ps\t\n" --- a/arch/xtensa/kernel/smp.c~xtensa-replace-config_debug_kernel-with-config_debug_misc +++ a/arch/xtensa/kernel/smp.c @@ -126,7 +126,7 @@ void secondary_start_kernel(void) init_mmu(); -#ifdef CONFIG_DEBUG_KERNEL +#ifdef CONFIG_DEBUG_MISC if (boot_secondary_processors == 0) { pr_debug("%s: boot_secondary_processors:%d; Hanging cpu:%d\n", __func__, boot_secondary_processors, cpu); _ Patches currently in -mm which might be from okaya@xxxxxxxxxx are init-introduce-debug_misc-option.patch powerpc-replace-config_debug_kernel-with-config_debug_misc.patch mips-replace-config_debug_kernel-with-config_debug_misc.patch xtensa-replace-config_debug_kernel-with-config_debug_misc.patch net-replace-config_debug_kernel-with-config_debug_misc.patch