rt_patches: required rebase due to printk change

[hercules2020/nv-tegra/linux-4.4.git] / rt-patches / 0074-panic-skip-get_random_bytes-for-RT_FULL-in-init_oops.patch

diff --git a/rt-patches/0074-panic-skip-get_random_bytes-for-RT_FULL-in-init_oops.patch b/rt-patches/0074-panic-skip-get_random_bytes-for-RT_FULL-in-init_oops.patch
index 0a000b139092931008923be85abb684dfb1e1220..f3db366da6ca67e2888e764bf82fec6b7e3a0d33 100644 (file)
--- a/rt-patches/0074-panic-skip-get_random_bytes-for-RT_FULL-in-init_oops.patch
+++ b/rt-patches/0074-panic-skip-get_random_bytes-for-RT_FULL-in-init_oops.patch
@@ -1,7 +1,7 @@
-From c900e27be0fbd1b6e1dde66513a340e67dda8487 Mon Sep 17 00:00:00 2001
+From 63dbbda0c5dc9bbbbfb08f0ca51bbda097d7299c Mon Sep 17 00:00:00 2001
 From: Thomas Gleixner <tglx@linutronix.de>
 Date: Tue, 14 Jul 2015 14:26:34 +0200
-Subject: [PATCH 074/365] panic: skip get_random_bytes for RT_FULL in
+Subject: [PATCH 074/366] panic: skip get_random_bytes for RT_FULL in
  init_oops_id
 
 Disable on -RT. If this is invoked from irq-context we will have problems
@@ -17,17 +17,17 @@ index ea8b7c0..63e4e16 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
 @@ -410,9 +410,11 @@ static int init_oops_id(void)
-       if (np)
-               of_property_read_u32(np, "panic-timeout-value", &panic_timeout);
-
+       if (np)
+               of_property_read_u32(np, "panic-timeout-value", &panic_timeout);
+ 
 +#ifndef CONFIG_PREEMPT_RT_FULL
-       if (!oops_id)
-               get_random_bytes(&oops_id, sizeof(oops_id));
-       else
+       if (!oops_id)
+               get_random_bytes(&oops_id, sizeof(oops_id));
+       else
 +#endif
                oops_id++;
  
        return 0;
 -- 
-2.7.4
+1.9.1