---

yaml --- r: 368584 b: refs/heads/master c: 4021db9 h: refs/heads/master v: v3
git-mirror · Mar 21, 2013 · d001ee1 · d001ee1
1 parent 49724df
commit d001ee1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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