diff --git a/[refs] b/[refs]
index 9df84351fe65..bfff52458fa6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fe9b1ea60bc209c8c87afcbb1c2ec0b28835aa4
+refs/heads/master: 491a7a436cc90e97d666cfc025e141ca3186f86c
diff --git a/trunk/drivers/serial/cpm_uart/cpm_uart_core.c b/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
old mode 100644
new mode 100755
index 43f58dc69fc9..d389a76b4afb
--- a/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -969,6 +969,14 @@ static void cpm_uart_console_write(struct console *co, const char *s,
 	unsigned int i;
 	cbd_t __iomem *bdp, *bdbase;
 	unsigned char *cp;
+	unsigned long flags;
+	int nolock = oops_in_progress;
+
+	if (unlikely(nolock)) {
+		local_irq_save(flags);
+	} else {
+		spin_lock_irqsave(&pinfo->port.lock, flags);
+	}
 
 	/* Get the address of the host memory buffer.
 	 */
@@ -1030,6 +1038,12 @@ static void cpm_uart_console_write(struct console *co, const char *s,
 		;
 
 	pinfo->tx_cur = bdp;
+
+	if (unlikely(nolock)) {
+		local_irq_restore(flags);
+	} else {
+		spin_unlock_irqrestore(&pinfo->port.lock, flags);
+	}
 }