From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 26 May 2010 01:53:57 +0000 (-0700)
Subject: cls_cgroup: Initialise classid when module is absent
X-Git-Tag: v2.6.35-rc1~24^2~21
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ea16f912a6ad9fe43131a2e2a108f089c432d510;p=linux-pvops.git

cls_cgroup: Initialise classid when module is absent

When the cls_cgroup module is not loaded, task_cls_classid will
return an uninitialised classid instead of zero.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

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;