rt_patches: required rebase due to printk change

[hercules2020/nv-tegra/linux-4.4.git] / rt-patches / 0029-printk-Add-a-printk-kill-switch.patch

diff --git a/rt-patches/0029-printk-Add-a-printk-kill-switch.patch b/rt-patches/0029-printk-Add-a-printk-kill-switch.patch
index 4bb961d95e6eba9aa1532711d5a003ae38a8cecd..53c84db1dcb35da5aa7ae5d9b28a6145d4238105 100644 (file)
--- a/rt-patches/0029-printk-Add-a-printk-kill-switch.patch
+++ b/rt-patches/0029-printk-Add-a-printk-kill-switch.patch
@@ -1,7 +1,7 @@
-From 8cb338d8f8efe27fbf7eed4a1d80b516373b8baa Mon Sep 17 00:00:00 2001
+From ca1f9e02a337584c2a69d21955e3ae99eaa3bae2 Mon Sep 17 00:00:00 2001
 From: Ingo Molnar <mingo@elte.hu>
 Date: Fri, 22 Jul 2011 17:58:40 +0200
-Subject: [PATCH 029/365] printk: Add a printk kill switch
+Subject: [PATCH 029/366] printk: Add a printk kill switch
 
 Add a prinkt-kill-switch. This is used from (NMI) watchdog to ensure that
 it does not dead-lock with the early printk code.
@@ -30,10 +30,10 @@ index 9729565..9cdca69 100644
  
  typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index e7e586b..9a80b6b 100644
+index 90da9c5..d6f2e2a 100644
 --- a/kernel/printk/printk.c
 +++ b/kernel/printk/printk.c
-@@ -1660,6 +1660,55 @@ static size_t cont_print_text(char *text, size_t size)
+@@ -1693,6 +1693,55 @@ static size_t cont_print_text(char *text, size_t size)
        return textlen;
  }
  
@@ -89,7 +89,7 @@ index e7e586b..9a80b6b 100644
  asmlinkage int vprintk_emit(int facility, int level,
                            const char *dict, size_t dictlen,
                            const char *fmt, va_list args)
-@@ -1676,6 +1725,13 @@ asmlinkage int vprintk_emit(int facility, int level,
+@@ -1709,6 +1758,13 @@ asmlinkage int vprintk_emit(int facility, int level,
        /* cpu currently holding logbuf_lock in this function */
        static unsigned int logbuf_cpu = UINT_MAX;
  
@@ -103,7 +103,7 @@ index e7e586b..9a80b6b 100644
        if (level == LOGLEVEL_SCHED) {
                level = LOGLEVEL_DEFAULT;
                in_sched = true;
-@@ -1969,26 +2025,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func);
+@@ -2002,26 +2058,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func);
  
  #endif /* CONFIG_PRINTK */
  
@@ -166,5 +166,5 @@ index 1f1b05f..0d180c9 100644
                        panic("Hard LOCKUP");
  
 -- 
-2.7.4
+1.9.1