diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-28 15:44:15 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-10 16:39:51 -0500 |
| commit | f4c80c8a2a03b60619267d52235b8b863a2f1639 (patch) | |
| tree | e3fb6fce5da57b710857300006d9c607f6164b29 | |
| parent | b18b1aa44efb39bdfa6806069b4552ec9d822f60 (diff) | |
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 2aea5d22db07..02c3c4f6c2dd 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -452,6 +452,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 c25d453b2803..13b863e589f1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2969,7 +2969,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; |