2012-06-26 06:28:34 +00:00
|
|
|
From 3cbc89cb4588fb756ae01316e2652119eb6dd5fc Mon Sep 17 00:00:00 2001
|
2012-06-04 21:20:09 +00:00
|
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
Date: Thu, 28 Jul 2011 13:32:57 +0200
|
2012-06-26 06:28:34 +00:00
|
|
|
Subject: [194/256] drivers-tty-fix-omap-lock-crap.patch
|
2012-06-04 21:20:09 +00:00
|
|
|
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
---
|
|
|
|
drivers/tty/serial/omap-serial.c | 12 ++++--------
|
|
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
|
2012-06-17 19:52:06 +00:00
|
|
|
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
|
|
|
|
index d00b38e..f697492 100644
|
|
|
|
--- a/drivers/tty/serial/omap-serial.c
|
|
|
|
+++ b/drivers/tty/serial/omap-serial.c
|
|
|
|
@@ -1064,13 +1064,10 @@ serial_omap_console_write(struct console *co, const char *s,
|
2012-06-04 21:20:09 +00:00
|
|
|
|
|
|
|
pm_runtime_get_sync(&up->pdev->dev);
|
|
|
|
|
|
|
|
- local_irq_save(flags);
|
|
|
|
- if (up->port.sysrq)
|
|
|
|
- locked = 0;
|
|
|
|
- else if (oops_in_progress)
|
|
|
|
- locked = spin_trylock(&up->port.lock);
|
|
|
|
+ if (up->port.sysrq || oops_in_progress)
|
|
|
|
+ locked = spin_trylock_irqsave(&up->port.lock, flags);
|
|
|
|
else
|
|
|
|
- spin_lock(&up->port.lock);
|
|
|
|
+ spin_lock_irqsave(&up->port.lock, flags);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* First save the IER then disable the interrupts
|
2012-06-17 19:52:06 +00:00
|
|
|
@@ -1099,8 +1096,7 @@ serial_omap_console_write(struct console *co, const char *s,
|
2012-06-04 21:20:09 +00:00
|
|
|
pm_runtime_mark_last_busy(&up->pdev->dev);
|
|
|
|
pm_runtime_put_autosuspend(&up->pdev->dev);
|
|
|
|
if (locked)
|
|
|
|
- spin_unlock(&up->port.lock);
|
|
|
|
- local_irq_restore(flags);
|
|
|
|
+ spin_unlock_irqrestore(&up->port.lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init
|