diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 10:38:04 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 10:38:04 +1000 |
commit | 1e143d0435b66fe53f7486fcce2c5c2b3705d166 (patch) | |
tree | 9119c953382beed47808b33253a33ca42f97175c /include | |
parent | 83d65ecf489b585c08f0cd78781829f62a247c5d (diff) | |
parent | d938a702e5ce8909ea68be97566150507bfea4df (diff) |
Merge remote branch 'net-current/master'
Diffstat (limited to 'include')
-rw-r--r-- | include/net/cls_cgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index 6cf44866cecd..726cc3536409 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h @@ -39,7 +39,7 @@ extern int net_cls_subsys_id; static inline u32 task_cls_classid(struct task_struct *p) { int id; - u32 classid; + u32 classid = 0; if (in_interrupt()) return 0; |