From 55dfa7c3b0b2cd69dafe6a09c927770eb8456d97 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 28 Jun 2011 15:44:15 +0200 Subject: [048/254] softirq-thread-do-softirq.patch Signed-off-by: Thomas Gleixner --- include/linux/interrupt.h | 1 + net/core/dev.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 2aea5d2..02c3c4f 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 99e1d75..ca7a845 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2963,7 +2963,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;