X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Finit_task.h;h=a2d95ff50e9bd71eb741d5ef9a293574245ab244;hb=e5cdcbf2556717fa1c006ad60fae90f0de7796e7;hp=b5315150199e9528bbfa1b5fcfe64b669b199058;hpb=4fd45812cbe875a620c86a096a5d46c742694b7e;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index b5315150199..a2d95ff50e9 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -66,7 +66,7 @@
 	.cpu_timers	= INIT_CPU_TIMERS(sig.cpu_timers),		\
 	.rlim		= INIT_RLIMITS,					\
 	.pgrp		= 1,						\
-	.tty_old_pgrp   = 0,						\
+	.tty_old_pgrp   = NULL,						\
 	{ .__session      = 1},						\
 }
 
@@ -75,7 +75,6 @@ extern struct nsproxy init_nsproxy;
 	.pid_ns		= &init_pid_ns,					\
 	.count		= ATOMIC_INIT(1),				\
 	.nslock		= __SPIN_LOCK_UNLOCKED(nsproxy.nslock),		\
-	.id		= 0,						\
 	.uts_ns		= &init_uts_ns,					\
 	.mnt_ns		= NULL,						\
 	INIT_IPC_NS(ipc_ns)						\