From cfa716a65337052cf73f4588701c7dbd6560246e Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 24 Jun 2010 20:33:04 -0700 Subject: [PATCH] --- yaml --- r: 203146 b: refs/heads/master c: deb0d7c740a008a4e26806317497549b0e8907eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/netpoll.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f56ac544c177..aa55731c697a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8244132ea89cdd128003f5b9980fab50d8d36d72 +refs/heads/master: deb0d7c740a008a4e26806317497549b0e8907eb diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c index 560297ee55b4..ca6dc31843ea 100644 --- a/trunk/net/core/netpoll.c +++ b/trunk/net/core/netpoll.c @@ -748,7 +748,6 @@ int __netpoll_setup(struct netpoll *np) /* last thing to do is link it to the net device structure */ rcu_assign_pointer(ndev->npinfo, npinfo); - rtnl_unlock(); return 0;