diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 18:50:40 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 18:50:59 +0000 |
commit | ba6b167af6ee5e63ca79ad22e7719644aed12b2c (patch) | |
tree | 62272cbe2fb256ecb90fa6e2cbfa509541954d28 /debian/patches-rt/tty_serial_pl011__Make_the_locking_work_on_RT.patch | |
parent | Merging upstream version 6.8.9. (diff) | |
download | linux-ba6b167af6ee5e63ca79ad22e7719644aed12b2c.tar.xz linux-ba6b167af6ee5e63ca79ad22e7719644aed12b2c.zip |
Merging debian version 6.8.9-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/tty_serial_pl011__Make_the_locking_work_on_RT.patch')
-rw-r--r-- | debian/patches-rt/tty_serial_pl011__Make_the_locking_work_on_RT.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/debian/patches-rt/tty_serial_pl011__Make_the_locking_work_on_RT.patch b/debian/patches-rt/tty_serial_pl011__Make_the_locking_work_on_RT.patch deleted file mode 100644 index c9a40db398..0000000000 --- a/debian/patches-rt/tty_serial_pl011__Make_the_locking_work_on_RT.patch +++ /dev/null @@ -1,46 +0,0 @@ -Subject: tty/serial/pl011: Make the locking work on RT -From: Thomas Gleixner <tglx@linutronix.de> -Date: Tue Jan 8 21:36:51 2013 +0100 -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz - -From: Thomas Gleixner <tglx@linutronix.de> - -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/amba-pl011.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) ---- ---- a/drivers/tty/serial/amba-pl011.c -+++ b/drivers/tty/serial/amba-pl011.c -@@ -2332,13 +2332,10 @@ pl011_console_write(struct console *co, - - clk_enable(uap->clk); - -- local_irq_save(flags); -- if (uap->port.sysrq) -- locked = 0; -- else if (oops_in_progress) -- locked = uart_port_trylock(&uap->port); -+ if (uap->port.sysrq || oops_in_progress) -+ locked = uart_port_trylock_irqsave(&uap->port, &flags); - else -- uart_port_lock(&uap->port); -+ uart_port_lock_irqsave(&uap->port, &flags); - - /* - * First save the CR then disable the interrupts -@@ -2364,8 +2361,7 @@ pl011_console_write(struct console *co, - pl011_write(old_cr, uap, REG_CR); - - if (locked) -- uart_port_unlock(&uap->port); -- local_irq_restore(flags); -+ uart_port_unlock_irqrestore(&uap->port, flags); - - clk_disable(uap->clk); - } |