[folded-merged] kernel-add-panic_on_warn-v7.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: kernel-add-panic_on_warn-v7
has been removed from the -mm tree.  Its filename was
     kernel-add-panic_on_warn-v7.patch

This patch was dropped because it was folded into kernel-add-panic_on_warn.patch

------------------------------------------------------
From: Prarit Bhargava <prarit@xxxxxxxxxx>
Subject: kernel-add-panic_on_warn-v7

swithch to core param, and remove change from v6

Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Fabian Frederick <fabf@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/panic.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff -puN kernel/panic.c~kernel-add-panic_on_warn-v7 kernel/panic.c
--- a/kernel/panic.c~kernel-add-panic_on_warn-v7
+++ a/kernel/panic.c
@@ -23,6 +23,7 @@
 #include <linux/sysrq.h>
 #include <linux/init.h>
 #include <linux/nmi.h>
+#include <linux/crash_dump.h>
 
 #define PANIC_TIMER_STEP 100
 #define PANIC_BLINK_SPD 18
@@ -436,7 +437,7 @@ static void warn_slowpath_common(const c
 		 * from panicking the system.
 		 */
 		panic_on_warn = 0;
-		panic("panic_on_warn set ... \n");
+		panic("panic_on_warn set ...\n");
 	}
 
 	print_modules();
@@ -496,6 +497,7 @@ EXPORT_SYMBOL(__stack_chk_fail);
 
 core_param(panic, panic_timeout, int, 0644);
 core_param(pause_on_oops, pause_on_oops, int, 0644);
+core_param(panic_on_warn, panic_on_warn, int, 0644);
 
 static int __init setup_crash_kexec_post_notifiers(char *s)
 {
@@ -513,10 +515,3 @@ static int __init oops_setup(char *s)
 	return 0;
 }
 early_param("oops", oops_setup);
-
-static int __init panic_on_warn_setup(char *s)
-{
-	panic_on_warn = 1;
-	return 0;
-}
-early_param("panic_on_warn", panic_on_warn_setup);
_

Patches currently in -mm which might be from prarit@xxxxxxxxxx are

kernel-add-panic_on_warn.patch
kernel-add-panic_on_warn-v9.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




[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux