aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-01-14 06:31:07 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2023-01-28 20:07:11 +0100
commit15b9c02d6c2bedded895bfbdaa551e68aec95f52 (patch)
tree553f18b1950ac2a861be9ca0f789c120249becce /target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch
parenta8025bc2c27dfe9a5fb542ef3471175de970780f (diff)
downloadupstream-15b9c02d6c2bedded895bfbdaa551e68aec95f52.tar.gz
upstream-15b9c02d6c2bedded895bfbdaa551e68aec95f52.tar.bz2
upstream-15b9c02d6c2bedded895bfbdaa551e68aec95f52.zip
kernel: bump 5.10 to 5.10.163
Removed upstreamed: generic/101-Use-stddefs.h-instead-of-compiler.h.patch[1] bcm27xx/patches-5.10/950-0194-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch All patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.163&id=ddd2bb08bd99b7ee4442fbbe0f9b80236fdd71d2 Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 2835df54ab84a8709057df156932497b19cda449)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch b/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch
index 478270fa5b..53578d623a 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch
@@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
spin_unlock(&uap->port.lock);
dev_vdbg(uap->port.dev,
"Took %d chars from DMA buffer and %d chars from the FIFO\n",
-@@ -1350,6 +1353,7 @@ __acquires(&uap->port.lock)
+@@ -1353,6 +1356,7 @@ __acquires(&uap->port.lock)
{
pl011_fifo_to_tty(uap);
@@ -66,7 +66,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
spin_unlock(&uap->port.lock);
tty_flip_buffer_push(&uap->port.state->port);
/*
-@@ -1483,6 +1487,7 @@ static irqreturn_t pl011_int(int irq, vo
+@@ -1486,6 +1490,7 @@ static irqreturn_t pl011_int(int irq, vo
int handled = 0;
spin_lock_irqsave(&uap->port.lock, flags);
@@ -74,7 +74,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
status = pl011_read(uap, REG_RIS) & uap->im;
if (status) {
do {
-@@ -1502,7 +1507,7 @@ static irqreturn_t pl011_int(int irq, vo
+@@ -1505,7 +1510,7 @@ static irqreturn_t pl011_int(int irq, vo
UART011_CTSMIS|UART011_RIMIS))
pl011_modem_status(uap);
if (status & UART011_TXIS)