diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-28 13:44:15 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:13 (GMT) |
| commit | 3fe81f330deafadcc0d35bd25b7bbbf6f36fe427 (patch) | |
| tree | 1b6bfe9e454a24835d9e1466a79ac135533e41f8 | |
| parent | 5ab820bce00ab4555c9cbfd7bc55546d136c693d (diff) | |
| download | linux-fsl-qoriq-3fe81f330deafadcc0d35bd25b7bbbf6f36fe427.tar.xz | |
softirq-thread-do-softirq.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/interrupt.h | 1 | ||||
| -rw-r--r-- | net/core/dev.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 623ab2d..acafa7d 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -412,6 +412,7 @@ struct softirq_action asmlinkage void do_softirq(void); asmlinkage void __do_softirq(void); +static inline void thread_do_softirq(void) { do_softirq(); } extern void open_softirq(int nr, void (*action)(struct softirq_action *)); extern void softirq_init(void); extern void __raise_softirq_irqoff(unsigned int nr); diff --git a/net/core/dev.c b/net/core/dev.c index ece49db..a0c8f06 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3284,7 +3284,7 @@ int netif_rx_ni(struct sk_buff *skb) preempt_disable(); err = netif_rx(skb); if (local_softirq_pending()) - do_softirq(); + thread_do_softirq(); preempt_enable(); return err; |