The patch titled Subject: kernel-hacking: move Oops into 'Lockups and Hangs' has been added to the -mm tree. Its filename is hacking-move-oops-into-lockups-and-hangs.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/hacking-move-oops-into-lockups-and-hangs.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/hacking-move-oops-into-lockups-and-hangs.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: Changbin Du <changbin.du@xxxxxxxxx> Subject: kernel-hacking: move Oops into 'Lockups and Hangs' They are similar options so place them together. Link: http://lkml.kernel.org/r/20190909144453.3520-6-changbin.du@xxxxxxxxx Signed-off-by: Changbin Du <changbin.du@xxxxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Tested-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/Kconfig.debug | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) --- a/lib/Kconfig.debug~hacking-move-oops-into-lockups-and-hangs +++ a/lib/Kconfig.debug @@ -783,7 +783,35 @@ config DEBUG_SHIRQ Drivers ought to be able to handle interrupts coming in at those points; some don't and need to be caught. -menu "Debug Lockups and Hangs" +menu "Debug Oops, Lockups and Hangs" + +config PANIC_ON_OOPS + bool "Panic on Oops" + help + Say Y here to enable the kernel to panic when it oopses. This + has the same effect as setting oops=panic on the kernel command + line. + + This feature is useful to ensure that the kernel does not do + anything erroneous after an oops which could result in data + corruption or other issues. + + Say N if unsure. + +config PANIC_ON_OOPS_VALUE + int + range 0 1 + default 0 if !PANIC_ON_OOPS + default 1 if PANIC_ON_OOPS + +config PANIC_TIMEOUT + int "panic timeout" + default 0 + help + Set the timeout value (in seconds) until a reboot occurs when the + the kernel panics. If n = 0, then we wait forever. A timeout + value n > 0 will wait n seconds before rebooting, while a timeout + value n < 0 will reboot immediately. config LOCKUP_DETECTOR bool @@ -941,34 +969,6 @@ config WQ_WATCHDOG endmenu # "Debug lockups and hangs" -config PANIC_ON_OOPS - bool "Panic on Oops" - help - Say Y here to enable the kernel to panic when it oopses. This - has the same effect as setting oops=panic on the kernel command - line. - - This feature is useful to ensure that the kernel does not do - anything erroneous after an oops which could result in data - corruption or other issues. - - Say N if unsure. - -config PANIC_ON_OOPS_VALUE - int - range 0 1 - default 0 if !PANIC_ON_OOPS - default 1 if PANIC_ON_OOPS - -config PANIC_TIMEOUT - int "panic timeout" - default 0 - help - Set the timeout value (in seconds) until a reboot occurs when the - the kernel panics. If n = 0, then we wait forever. A timeout - value n > 0 will wait n seconds before rebooting, while a timeout - value n < 0 will reboot immediately. - config SCHED_DEBUG bool "Collect scheduler debugging info" depends on DEBUG_KERNEL && PROC_FS _ Patches currently in -mm which might be from changbin.du@xxxxxxxxx are hacking-group-sysrq-kgdb-ubsan-into-generic-kernel-debugging-instruments.patch hacking-create-submenu-for-arch-special-debugging-options.patch hacking-group-kernel-data-structures-debugging-together.patch hacking-move-kernel-testing-and-coverage-options-to-same-submenu.patch hacking-move-oops-into-lockups-and-hangs.patch hacking-move-sched_stack_end_check-after-debug_stack_usage.patch hacking-create-a-submenu-for-scheduler-debugging-options.patch hacking-move-debug_bugverbose-to-printk-and-dmesg-options.patch hacking-move-debug_fs-to-generic-kernel-debugging-instruments.patch