41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 12d7471454197ceb16e5d329f3824ec790f6d32c Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Thu, 28 Jul 2011 13:32:57 +0200
|
|
Subject: [PATCH 214/287] drivers-tty-fix-omap-lock-crap.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
drivers/tty/serial/omap-serial.c | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
|
|
index 5e713d3..93cdb92 100644
|
|
--- a/drivers/tty/serial/omap-serial.c
|
|
+++ b/drivers/tty/serial/omap-serial.c
|
|
@@ -946,13 +946,12 @@ serial_omap_console_write(struct console *co, const char *s,
|
|
unsigned int ier;
|
|
int locked = 1;
|
|
|
|
- local_irq_save(flags);
|
|
if (up->port.sysrq)
|
|
locked = 0;
|
|
else if (oops_in_progress)
|
|
- locked = spin_trylock(&up->port.lock);
|
|
+ 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
|
|
@@ -979,8 +978,7 @@ serial_omap_console_write(struct console *co, const char *s,
|
|
check_modem_status(up);
|
|
|
|
if (locked)
|
|
- spin_unlock(&up->port.lock);
|
|
- local_irq_restore(flags);
|
|
+ spin_unlock_irqrestore(&up->port.lock, flags);
|
|
}
|
|
|
|
static int __init
|