| From 2e70af56ff471c2d29d9184f266bde671cd14cdd Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun, 17 Jul 2011 16:29:27 +0200 |
| Subject: [PATCH 157/274] net-netif_rx_ni-migrate-disable.patch |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| net/core/dev.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/net/core/dev.c b/net/core/dev.c |
| index bfd80c5..11b785f 100644 |
| --- a/net/core/dev.c |
| +++ b/net/core/dev.c |
| @@ -2960,11 +2960,11 @@ int netif_rx_ni(struct sk_buff *skb) |
| { |
| int err; |
| |
| - preempt_disable(); |
| + migrate_disable(); |
| err = netif_rx(skb); |
| if (local_softirq_pending()) |
| thread_do_softirq(); |
| - preempt_enable(); |
| + migrate_enable(); |
| |
| return err; |
| } |
| -- |
| 1.7.10.4 |
| |
