diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-03 00:35:32 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-03 00:35:32 -0400 |
| commit | 0313785b5c9117c5b14140c9e0266e5e245c4564 (patch) | |
| tree | 9bf9b5b5f11bb542a62625e55fd1e333552cc626 | |
| parent | 26d8189167cfabe42cc5c96b5fce4478dea895cf (diff) | |
| download | 4.12-rt-patches-0313785b5c9117c5b14140c9e0266e5e245c4564.tar.gz | |
refresh net/core softirq patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/net-core-remove-explicit-do_softirq-from-busy_poll_s.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/patches/net-core-remove-explicit-do_softirq-from-busy_poll_s.patch b/patches/net-core-remove-explicit-do_softirq-from-busy_poll_s.patch index b62ce0524651a8..82d7c1e4f1738a 100644 --- a/patches/net-core-remove-explicit-do_softirq-from-busy_poll_s.patch +++ b/patches/net-core-remove-explicit-do_softirq-from-busy_poll_s.patch @@ -1,6 +1,7 @@ +From 94550dc8e1ebce3dd940ea540f033583f9aaa736 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon, 22 May 2017 21:08:08 +0200 -Subject: net/core: remove explicit do_softirq() from busy_poll_stop() +Subject: [PATCH] net/core: remove explicit do_softirq() from busy_poll_stop() Since commit 217f69743681 ("net: busy-poll: allow preemption in sk_busy_loop()") there is an explicit do_softirq() invocation after @@ -10,13 +11,12 @@ invoke do_softirq() once the softirq counter reached zero and we have softirq-related work pending. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - net/core/dev.c | 2 -- - 1 file changed, 2 deletions(-) +diff --git a/net/core/dev.c b/net/core/dev.c +index d07aa5ffb511..63ecc0641325 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5070,8 +5070,6 @@ static void busy_poll_stop(struct napi_s +@@ -5198,8 +5198,6 @@ static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock) if (rc == BUSY_POLL_BUDGET) __napi_schedule(napi); local_bh_enable(); @@ -24,4 +24,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> - do_softirq(); } - bool sk_busy_loop(struct sock *sk, int nonblock) + void napi_busy_loop(unsigned int napi_id, +-- +2.1.4 + |