summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2018-05-28 17:34:34 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2018-05-28 17:34:34 +0200
commitbfdc181c0c9bd6c8c55cd44563db24aa7bc7bb1e (patch)
tree95197a8aee23615842a786625db3a38afababf3a
parent6769115cce5d5361757191d1b567f253d928f64f (diff)
downloadlinux-rt-4.16.12-rt4-patches.tar.gz
[ANNOUNCE] v4.16.12-rt4v4.16.12-rt4-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r--patches/drivers-net-8139-disable-irq-nosync.patch27
-rw-r--r--patches/localversion.patch2
-rw-r--r--patches/series1
3 files changed, 1 insertions, 29 deletions
diff --git a/patches/drivers-net-8139-disable-irq-nosync.patch b/patches/drivers-net-8139-disable-irq-nosync.patch
deleted file mode 100644
index 2d8b05369034..000000000000
--- a/patches/drivers-net-8139-disable-irq-nosync.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Ingo Molnar <mingo@elte.hu>
-Date: Fri, 3 Jul 2009 08:29:24 -0500
-Subject: drivers/net: Use disable_irq_nosync() in 8139too
-
-upstream commit af3e0fcf78879f718c5f73df0814951bd7057d34
-
-Use disable_irq_nosync() instead of disable_irq() as this might be
-called in atomic context with netpoll.
-
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-
----
- drivers/net/ethernet/realtek/8139too.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/realtek/8139too.c
-+++ b/drivers/net/ethernet/realtek/8139too.c
-@@ -2224,7 +2224,7 @@ static void rtl8139_poll_controller(stru
- struct rtl8139_private *tp = netdev_priv(dev);
- const int irq = tp->pci_dev->irq;
-
-- disable_irq(irq);
-+ disable_irq_nosync(irq);
- rtl8139_interrupt(irq, dev);
- enable_irq(irq);
- }
diff --git a/patches/localversion.patch b/patches/localversion.patch
index e36eb4b6666a..03a80b8b0e80 100644
--- a/patches/localversion.patch
+++ b/patches/localversion.patch
@@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- /dev/null
+++ b/localversion-rt
@@ -0,0 +1 @@
-+-rt3
++-rt4
diff --git a/patches/series b/patches/series
index 8800f925b234..2921f57b80e8 100644
--- a/patches/series
+++ b/patches/series
@@ -94,7 +94,6 @@ tracing-Fix-display-of-hist-trigger-expressions-cont.patch
locking-rtmutex-Handle-non-enqueued-waiters-graceful.patch
sched-Remove-TASK_ALL.patch
rxrpc-remove-unused-static-variables.patch
-drivers-net-8139-disable-irq-nosync.patch
delayacct-use-raw_spinlocks.patch
stop-machine-raw-lock.patch
mmci-remove-bogus-irq-save.patch