---

yaml --- r: 33101 b: refs/heads/master c: e6eb307 h: refs/heads/master i: 33099: 36721f3 v: v3
git-mirror · Aug 2, 2006 · 302826f · 302826f
1 parent d3f7d08
commit 302826f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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();
 }
 
 /**