From: Andrew Morton <akpm@osdl.org>

Cc: Shailabh Nagar <nagar@us.ibm.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/taskstats.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff -puN kernel/taskstats.c~per-task-delay-accounting-taskstats-interface-tidy kernel/taskstats.c
--- a/kernel/taskstats.c~per-task-delay-accounting-taskstats-interface-tidy
+++ a/kernel/taskstats.c
@@ -22,7 +22,7 @@
 #include <asm/atomic.h>
 
 static DEFINE_PER_CPU(__u32, taskstats_seqnum) = { 0 };
-static int family_registered = 0;
+static int family_registered;
 kmem_cache_t *taskstats_cache;
 static DEFINE_MUTEX(taskstats_exit_mutex);
 
@@ -317,16 +317,15 @@ static int __init taskstats_init(void)
 	rc = genl_register_family(&family);
 	if (rc)
 		return rc;
-	family_registered = 1;
 
 	rc = genl_register_ops(&family, &taskstats_ops);
 	if (rc < 0)
 		goto err;
 
+	family_registered = 1;
 	return 0;
 err:
 	genl_unregister_family(&family);
-	family_registered = 0;
 	return rc;
 }
 
_