diff --git a/[refs] b/[refs] index 37d8cd58aabb..712339a0556d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c658f19db3c3077a3328a0e0ea182f6777337c40 +refs/heads/master: 920750ce38520da9d3e5e6f5bccb0a2b88da4d7d diff --git a/trunk/include/net/cls_cgroup.h b/trunk/include/net/cls_cgroup.h index b6a6eeb3905f..0fee0617fb7d 100644 --- a/trunk/include/net/cls_cgroup.h +++ b/trunk/include/net/cls_cgroup.h @@ -29,7 +29,7 @@ extern void sock_update_classid(struct sock *sk); #if IS_BUILTIN(CONFIG_NET_CLS_CGROUP) static inline u32 task_cls_classid(struct task_struct *p) { - int classid; + u32 classid; if (in_interrupt()) return 0;