diff --git a/[refs] b/[refs] index 8e345a0db1b0..b405c574e843 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e269ed26d4c9e6da1614709c1bf4c50ff8c8c5b3 +refs/heads/master: dc95a2c00671cf383cd037d943fbfe178f9ba81a diff --git a/trunk/include/net/cls_cgroup.h b/trunk/include/net/cls_cgroup.h index 571de6efad8f..2581638f4a3d 100644 --- a/trunk/include/net/cls_cgroup.h +++ b/trunk/include/net/cls_cgroup.h @@ -61,7 +61,7 @@ static inline u32 task_cls_classid(struct task_struct *p) } #endif #else /* !CGROUP_NET_CLS_CGROUP */ -static inline void sock_update_classid(struct sock *sk) +static inline void sock_update_classid(struct sock *sk, struct task_struct *task) { }