---

yaml --- r: 142369 b: refs/heads/master c: 4e69489 h: refs/heads/master i: 142367: e34a592 v: v3
git-mirror · Apr 4, 2009 · 8d636f4 · 8d636f4
1 parent 761cc72
commit 8d636f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62994b2d6beb5f7c59a25bf77e01f191acf74ea2
+refs/heads/master: 4e69489a0ac11a9b62a25923975bfc370a30eae5
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
@@ -493,8 +493,7 @@ static struct socket *sock_alloc(void)
 	inode->i_uid = current_fsuid();
 	inode->i_gid = current_fsgid();
 
-	get_cpu_var(sockets_in_use)++;
-	put_cpu_var(sockets_in_use);
+	percpu_add(sockets_in_use, 1);
 	return sock;
 }
 
@@ -536,8 +535,7 @@ void sock_release(struct socket *sock)
 	if (sock->fasync_list)
 		printk(KERN_ERR "sock_release: fasync list not empty!\n");
 
-	get_cpu_var(sockets_in_use)--;
-	put_cpu_var(sockets_in_use);
+	percpu_sub(sockets_in_use, 1);
 	if (!sock->file) {
 		iput(SOCK_INODE(sock));
 		return;