| From de54230e33d025e8fbd713e8cb6f13771a12f95f Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Tue, 28 Jun 2011 15:44:15 +0200 |
| Subject: [PATCH 048/274] softirq-thread-do-softirq.patch |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| 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 eb858dc..aba24b6 100644 |
| --- a/net/core/dev.c |
| +++ b/net/core/dev.c |
| @@ -2965,7 +2965,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; |
| -- |
| 1.7.10.4 |
| |
