rt_patches: required rebase due to printk change

[hercules2020/nv-tegra/linux-4.4.git] / rt-patches / 0337-panic-change-nmi_panic-from-macro-to-function.patch

diff --git a/rt-patches/0337-panic-change-nmi_panic-from-macro-to-function.patch b/rt-patches/0337-panic-change-nmi_panic-from-macro-to-function.patch
index 51de1ca2877cd78338c77f7ea4d06d5ad3b28e7a..a327c5d05be11ffc69a7daf901a9f2293bbe96c4 100644 (file)
--- a/rt-patches/0337-panic-change-nmi_panic-from-macro-to-function.patch
+++ b/rt-patches/0337-panic-change-nmi_panic-from-macro-to-function.patch
@@ -1,7 +1,7 @@
-From a291356c6829d639ad99c83c7453c21428e090e2 Mon Sep 17 00:00:00 2001
+From d736dddfd0a5d0fe8e1adb146fba2fecc0a1551c Mon Sep 17 00:00:00 2001
 From: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
 Date: Tue, 22 Mar 2016 14:27:17 -0700
-Subject: [PATCH 337/365] panic: change nmi_panic from macro to function
+Subject: [PATCH 337/366] panic: change nmi_panic from macro to function
 
 Commit 1717f2096b54 ("panic, x86: Fix re-entrance problem due to panic
 on NMI") and commit 58c5661f2144 ("panic, x86: Allow CPUs to save
@@ -45,7 +45,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  2 files changed, 21 insertions(+), 20 deletions(-)
 
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 3cd9b629..8d08e98 100644
+index c130695..aed2a21 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
 @@ -259,7 +259,7 @@ extern long (*panic_blink)(int state);
@@ -84,10 +84,10 @@ index 3cd9b629..8d08e98 100644
   * CONFIG_PANIC_TIMEOUT, honor it.
   */
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 5937902..4c62a4f 100644
+index 9d093cbf..5514a30 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -75,6 +75,26 @@ void __weak nmi_panic_self_stop(struct pt_regs *regs)
+@@ -76,6 +76,26 @@ void __weak nmi_panic_self_stop(struct pt_regs *regs)
  
  atomic_t panic_cpu = ATOMIC_INIT(PANIC_CPU_INVALID);
  
@@ -115,5 +115,5 @@ index 5937902..4c62a4f 100644
   *    panic - halt the system
   *    @fmt: The text string to print
 -- 
-2.7.4
+1.9.1