From 2778405e7843ac77eea23e6136a7267fe99abd4a Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Jan 2012 16:33:16 +1100
Subject: [PATCH] --- yaml --- r: 281966 b: refs/heads/master c:
 475f1b52645a29936b9df1d8fcd45f7e56bd4a9f h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 6 ------
 trunk/net/core/sock.c    | 6 ++++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e6489b785aa2..4c5ab46614ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b189e810619a676e6b931a942a3e8387f3d39c21
+refs/heads/master: 475f1b52645a29936b9df1d8fcd45f7e56bd4a9f
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 0ed65e3a0bea..bb972d254dff 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -1103,12 +1103,6 @@ sk_sockets_allocated_read_positive(struct sock *sk)
 	return percpu_counter_sum_positive(prot->sockets_allocated);
 }
 
-static inline void sk_update_clone(const struct sock *sk, struct sock *newsk)
-{
-	if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-		sock_update_memcg(newsk);
-}
-
 static inline int
 proto_sockets_allocated_sum_positive(struct proto *prot)
 {
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index e80b64fbd663..c3ae73de0239 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -1272,6 +1272,12 @@ void sk_release_kernel(struct sock *sk)
 }
 EXPORT_SYMBOL(sk_release_kernel);
 
+static void sk_update_clone(const struct sock *sk, struct sock *newsk)
+{
+	if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
+		sock_update_memcg(newsk);
+}
+
 /**
  *	sk_clone_lock - clone a socket, and lock its clone
  *	@sk: the socket to clone