diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-28 13:44:15 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:50 (GMT) |
| commit | 6484dd51192b05dae1c26660deebc6dc01b7a1b0 (patch) | |
| tree | f66182831630b156635e8e5efbe8115e78387af3 | |
| parent | cc045efffa04a524e3528113fc4d738619a292a6 (diff) | |
| download | linux-fsl-qoriq-6484dd51192b05dae1c26660deebc6dc01b7a1b0.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 5e865b5..1f6367a 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -374,6 +374,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 b327975..f9a892b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3270,7 +3270,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; |