[kernel] r19429 - dists/sid/linux/debian/patches/features/all/rt

[Ben Hutchings]

Author: benh
Date: Wed Oct 10 05:19:29 2012
New Revision: 19429

Log:
Fix conflict in the new patch in 3.2.30-rt45

Modified:
   dists/sid/linux/debian/patches/features/all/rt/0278-fix-printk-flush-of-messages.patch

Modified: dists/sid/linux/debian/patches/features/all/rt/0278-fix-printk-flush-of-messages.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/all/rt/0278-fix-printk-flush-of-messages.patch	Wed Oct 10 05:15:23 2012	(r19428)
+++ dists/sid/linux/debian/patches/features/all/rt/0278-fix-printk-flush-of-messages.patch	Wed Oct 10 05:19:29 2012	(r19429)
@@ -11,6 +11,7 @@
 Signed-off-by: Frank Rowand <frank.rowand at am.sony.com>
 Link: http://lkml.kernel.org/r/4FB44EF1.9050809@am.sony.com
 Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
+[bwh: make apply on top of debian/sysrq-mask.patch]
 ---
  drivers/tty/serial/cpm_uart/cpm_uart_core.c |    2 +-
  drivers/tty/sysrq.c                         |   23 -----------------------
@@ -19,11 +20,9 @@
  lib/Kconfig.debug                           |   22 ----------------------
  5 files changed, 3 insertions(+), 54 deletions(-)
 
-diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
-index a8b0559..b418947 100644
 --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
 +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
-@@ -1226,7 +1226,7 @@ static void cpm_uart_console_write(struct console *co, const char *s,
+@@ -1226,7 +1226,7 @@ static void cpm_uart_console_write(struc
  {
  	struct uart_cpm_port *pinfo = &cpm_uart_ports[co->index];
  	unsigned long flags;
@@ -32,11 +31,9 @@
  
  	if (unlikely(nolock)) {
  		local_irq_save(flags);
-diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 5219738..43db715 100644
 --- a/drivers/tty/sysrq.c
 +++ b/drivers/tty/sysrq.c
-@@ -492,23 +492,6 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
+@@ -492,23 +492,6 @@ static void __sysrq_put_key_op(int key,
                  sysrq_key_table[i] = op_p;
  }
  
@@ -60,7 +57,7 @@
  void __handle_sysrq(int key, bool check_mask)
  {
  	struct sysrq_key_op *op_p;
-@@ -517,9 +500,6 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -517,9 +500,6 @@ void __handle_sysrq(int key, bool check_
  	unsigned long flags;
  
  	spin_lock_irqsave(&sysrq_key_table_lock, flags);
@@ -70,7 +67,7 @@
  	/*
  	 * Raise the apparent loglevel to maximum so that the sysrq header
  	 * is shown to provide the user with positive feedback.  We do not
-@@ -561,9 +541,6 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -561,9 +541,6 @@ void __handle_sysrq(int key, bool check_
  		printk("\n");
  		console_loglevel = orig_log_level;
  	}
@@ -80,8 +77,6 @@
  	spin_unlock_irqrestore(&sysrq_key_table_lock, flags);
  }
  
-diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
-index d224c0b..7faf933 100644
 --- a/include/linux/sysrq.h
 +++ b/include/linux/sysrq.h
 @@ -38,11 +38,6 @@ struct sysrq_key_op {
@@ -96,8 +91,6 @@
  #ifdef CONFIG_MAGIC_SYSRQ
  
  /* Generic SysRq interface -- you may call it from any device driver, supplying
-diff --git a/kernel/printk.c b/kernel/printk.c
-index 66e83e5..85d8795 100644
 --- a/kernel/printk.c
 +++ b/kernel/printk.c
 @@ -21,7 +21,6 @@
@@ -108,7 +101,7 @@
  #include <linux/init.h>
  #include <linux/jiffies.h>
  #include <linux/nmi.h>
-@@ -835,8 +834,8 @@ static int console_trylock_for_printk(unsigned int cpu, unsigned long flags)
+@@ -835,8 +834,8 @@ static int console_trylock_for_printk(un
  {
  	int retval = 0, wake = 0;
  #ifdef CONFIG_PREEMPT_RT_FULL
@@ -119,13 +112,11 @@
  #else
  	int lock = 1;
  #endif
-diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 13a937b..c347db3 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
-@@ -62,28 +62,6 @@ config MAGIC_SYSRQ
- 	  keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
- 	  unless you really know what this hack does.
+@@ -70,28 +70,6 @@ config MAGIC_SYSRQ_DEFAULT_MASK
+ 	  Specifies the default mask for the allowed SysRq keys.  This can be
+ 	  used to disable several sensitive keys by default.
  
 -config MAGIC_SYSRQ_FORCE_PRINTK
 -	bool "Force printk from Magic SysRq"