From: Zefan Li <lizefan@huawei.com> Date: Wed, 20 Mar 2013 16:54:51 +0000 (+0000) Subject: net: remove redundant ifdef CONFIG_CGROUPS X-Git-Tag: kvm-3.10-2~76^2~385 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4021db9a0daa42ff72570f7b0375d195e528f73f;p=users%2Fdwmw2%2Flinux.git net: remove redundant ifdef CONFIG_CGROUPS The cgroup code has been surrounded by ifdef CONFIG_NET_CLS_CGROUP and CONFIG_NETPRIO_CGROUP. Signed-off-by: Li Zefan <lizefan@huawei.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> --- diff --git a/net/core/sock.c b/net/core/sock.c index b261a79777462..a19e728d5fb61 100644 --- a/net/core/sock.c +++ b/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