Merge tag 'kvm-arm-for-4.3-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / include / net / netprio_cgroup.h

diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index dafc09f0fdbc86f8b87180cbee2e733694b89085..f2a9597ff53c089cb3aa4a810e6286355c9f194c 100644 (file)
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -27,32 +27,17 @@ struct netprio_map {
 
 void sock_update_netprioidx(struct sock *sk);
 
-#if IS_BUILTIN(CONFIG_CGROUP_NET_PRIO)
 static inline u32 task_netprioidx(struct task_struct *p)
 {
        struct cgroup_subsys_state *css;
        u32 idx;
 
        rcu_read_lock();
-       css = task_css(p, net_prio_subsys_id);
+       css = task_css(p, net_prio_cgrp_id);
        idx = css->cgroup->id;
        rcu_read_unlock();
        return idx;
 }
-#elif IS_MODULE(CONFIG_CGROUP_NET_PRIO)
-static inline u32 task_netprioidx(struct task_struct *p)
-{
-       struct cgroup_subsys_state *css;
-       u32 idx = 0;
-
-       rcu_read_lock();
-       css = task_css(p, net_prio_subsys_id);
-       if (css)
-               idx = css->cgroup->id;
-       rcu_read_unlock();
-       return idx;
-}
-#endif
 #else /* !CONFIG_CGROUP_NET_PRIO */
 static inline u32 task_netprioidx(struct task_struct *p)
 {