From d001ee174271a8fea791fa5ed775770a6df64db6 Mon Sep 17 00:00:00 2001
From: Zefan Li <lizefan@huawei.com>
Date: Wed, 20 Mar 2013 16:54:51 +0000
Subject: [PATCH] --- yaml --- r: 368584 b: refs/heads/master c:
 4021db9a0daa42ff72570f7b0375d195e528f73f h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9246e236e657..4d317235f488 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e33099f96d99c391b3325caa9c44258de04aae86
+refs/heads/master: 4021db9a0daa42ff72570f7b0375d195e528f73f
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index b261a7977746..a19e728d5fb6 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -1298,7 +1298,6 @@ static void sk_prot_free(struct proto *prot, struct sock *sk)
 	module_put(owner);
 }
 
-#ifdef CONFIG_CGROUPS
 #if IS_ENABLED(CONFIG_NET_CLS_CGROUP)
 void sock_update_classid(struct sock *sk, struct task_struct *task)
 {
@@ -1321,7 +1320,6 @@ void sock_update_netprioidx(struct sock *sk, struct task_struct *task)
 }
 EXPORT_SYMBOL_GPL(sock_update_netprioidx);
 #endif
-#endif
 
 /**
  *	sk_alloc - All socket objects are allocated here