diff options
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 8d10aa7fd4c..8ed0abf06f8 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -111,6 +111,12 @@ extern struct cred init_cred;  # define INIT_PERF_EVENTS(tsk)  #endif +#ifdef CONFIG_FS_JOURNAL_INFO +#define INIT_JOURNAL_INFO	.journal_info = NULL, +#else +#define INIT_JOURNAL_INFO +#endif +  /*   *  INIT_TASK is used to set up the first task table, touch at   * your own risk!. Base=0, limit=0x1fffff (=2MB) @@ -162,7 +168,6 @@ extern struct cred init_cred;  		.signal = {{0}}},					\  	.blocked	= {{0}},					\  	.alloc_lock	= __SPIN_LOCK_UNLOCKED(tsk.alloc_lock),		\ -	.journal_info	= NULL,						\  	.cpu_timers	= INIT_CPU_TIMERS(tsk.cpu_timers),		\  	.fs_excl	= ATOMIC_INIT(0),				\  	.pi_lock	= __SPIN_LOCK_UNLOCKED(tsk.pi_lock),		\ @@ -173,6 +178,7 @@ extern struct cred init_cred;  		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\  	},								\  	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\ +	INIT_JOURNAL_INFO						\  	INIT_IDS							\  	INIT_PERF_EVENTS(tsk)						\  	INIT_TRACE_IRQFLAGS						\  |