diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 16:29:27 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-05-08 22:31:38 +0200 |
| commit | 054f5f7e52c95210df4bc57519540d70689eeab1 (patch) | |
| tree | e7b42bc3e72208282274b552e5ea949a6a039a6e /net | |
| parent | a78f368ca87ffc12b6142c5a7d5fdb0f954d93f9 (diff) | |
net-netif_rx_ni-migrate-disable.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index fd7170e62539..ab0646d36b88 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3404,11 +3404,11 @@ int netif_rx_ni(struct sk_buff *skb) trace_netif_rx_ni_entry(skb); - preempt_disable(); + migrate_disable(); err = netif_rx_internal(skb); if (local_softirq_pending()) thread_do_softirq(); - preempt_enable(); + migrate_enable(); return err; } |