From 302826f851e014c2543b28c692be08917b3118c1 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Wed, 2 Aug 2006 14:21:19 -0700 Subject: [PATCH] --- yaml --- r: 33101 b: refs/heads/master c: e6eb307d48c81d688804f8b39a0a3ddde3cd3458 h: refs/heads/master i: 33099: 36721f3bfe5ff150b8fc62f211b4904fa1978478 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fee5bb0004aa..151b44d1dbf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bbf28a1ff7b9d4e7df57829c25638721984277b +refs/heads/master: e6eb307d48c81d688804f8b39a0a3ddde3cd3458 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 5b630cece707..f25d7ecaf035 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3419,12 +3419,9 @@ static void net_dma_rebalance(void) unsigned int cpu, i, n; struct dma_chan *chan; - lock_cpu_hotplug(); - if (net_dma_count == 0) { for_each_online_cpu(cpu) rcu_assign_pointer(per_cpu(softnet_data.net_dma, cpu), NULL); - unlock_cpu_hotplug(); return; } @@ -3444,8 +3441,6 @@ static void net_dma_rebalance(void) i++; } rcu_read_unlock(); - - unlock_cpu_hotplug(); } /**