diff options
Diffstat (limited to 'features/rt/tty-serial-omap-Make-the-locking-RT-aware.patch')
| -rw-r--r-- | features/rt/tty-serial-omap-Make-the-locking-RT-aware.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/features/rt/tty-serial-omap-Make-the-locking-RT-aware.patch b/features/rt/tty-serial-omap-Make-the-locking-RT-aware.patch new file mode 100644 index 00000000..a78020da --- /dev/null +++ b/features/rt/tty-serial-omap-Make-the-locking-RT-aware.patch @@ -0,0 +1,48 @@ +From d818b28e0298adb1eeb3b3d722d3bf10318fa90d Mon Sep 17 00:00:00 2001 +From: Thomas Gleixner <tglx@linutronix.de> +Date: Thu, 28 Jul 2011 13:32:57 +0200 +Subject: [PATCH 171/191] tty/serial/omap: Make the locking RT aware + +The lock is a sleeping lock and local_irq_save() is not the +optimsation we are looking for. Redo it to make it work on -RT and +non-RT. + +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +--- + drivers/tty/serial/omap-serial.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c +index 76b94d0ff586..80371598efea 100644 +--- a/drivers/tty/serial/omap-serial.c ++++ b/drivers/tty/serial/omap-serial.c +@@ -1301,13 +1301,10 @@ serial_omap_console_write(struct console *co, const char *s, + + pm_runtime_get_sync(up->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 +@@ -1336,8 +1333,7 @@ serial_omap_console_write(struct console *co, const char *s, + pm_runtime_mark_last_busy(up->dev); + pm_runtime_put_autosuspend(up->dev); + if (locked) +- spin_unlock(&up->port.lock); +- local_irq_restore(flags); ++ spin_unlock_irqrestore(&up->port.lock, flags); + } + + static int __init +-- +2.19.1 + |