[PATCH -rt] serial: scheduling with irqs disabled

[dwalker@mvista.com]

Saw this during bootup ..

BUG: scheduling with irqs disabled: insmod/0x00000000/1110
caller is rt_spin_lock_slowlock+0x89/0x190
 [<c0104c3b>] show_trace+0x1b/0x20
 [<c0104d44>] dump_stack+0x24/0x30
 [<c040ff9e>] schedule+0x10e/0x120
 [<c0410d99>] rt_spin_lock_slowlock+0x89/0x190
 [<c0411502>] rt_spin_lock+0x22/0x30
 [<c0291669>] serial8250_console_write+0x49/0x170
 [<c011fa8d>] __call_console_drivers+0x6d/0x80
 [<c011fae3>] _call_console_drivers+0x43/0x90
 [<c0120265>] release_console_sem+0xe5/0x240
 [<c011fe4e>] vprintk+0x20e/0x380
 [<c011ffdb>] printk+0x1b/0x20
 [<c0140345>] sys_init_module+0xba5/0x1a30
 [<c01034d7>] syscall_call+0x7/0xb
---------------------------
| preempt count: 00000000 ]
| 0-level deep critical section nesting:
----------------------------------------

Signed-Off-By: Daniel Walker <dwalker@mvista.com>

---
 drivers/serial/8250.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.18/drivers/serial/8250.c
===================================================================
--- linux-2.6.18.orig/drivers/serial/8250.c
+++ linux-2.6.18/drivers/serial/8250.c
@@ -2252,7 +2252,7 @@ serial8250_console_write(struct console 
 
 	touch_nmi_watchdog();
 
-	local_irq_save(flags);
+	local_irq_save_nort(flags);
 	if (up->port.sysrq) {
 		/* serial8250_handle_port() already took the lock */
 		locked = 0;
@@ -2282,7 +2282,7 @@ serial8250_console_write(struct console 
 
 	if (locked)
 		spin_unlock(&up->port.lock);
-	local_irq_restore(flags);
+	local_irq_restore_nort(flags);
 }
 
 static int serial8250_console_setup(struct console *co, char *options)
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/