---

yaml --- r: 299961 b: refs/heads/master c: 518fbf9 h: refs/heads/master i: 299959: 19d5178 v: v3
git-mirror · Apr 30, 2012 · 0db82cc · 0db82cc
1 parent 79a3c70
commit 0db82cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5414fc12e32a0e0833ec61ba8be864c46cd19966
+refs/heads/master: 518fbf9cdf17875d808596afd77fc115a6f942ca
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
@@ -1129,9 +1129,9 @@ sk_sockets_allocated_read_positive(struct sock *sk)
 	struct proto *prot = sk->sk_prot;
 
 	if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-		return percpu_counter_sum_positive(sk->sk_cgrp->sockets_allocated);
+		return percpu_counter_read_positive(sk->sk_cgrp->sockets_allocated);
 
-	return percpu_counter_sum_positive(prot->sockets_allocated);
+	return percpu_counter_read_positive(prot->sockets_allocated);
 }
 
 static inline int