Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index a2d95ff..45170b2 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -95,7 +95,7 @@ extern struct group_info init_groups;
 #define INIT_TASK(tsk) \
 {                                                                      \
        .state          = 0,                                            \
-       .thread_info    = &init_thread_info,                            \
+       .stack          = &init_thread_info,                            \
        .usage          = ATOMIC_INIT(2),                               \
        .flags          = 0,                                            \
        .lock_depth     = -1,                                           \
@@ -138,7 +138,7 @@ extern struct group_info init_groups;
        .journal_info   = NULL,                                         \
        .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
        .fs_excl        = ATOMIC_INIT(0),                               \
-       .pi_lock        = SPIN_LOCK_UNLOCKED,                           \
+       .pi_lock        = __SPIN_LOCK_UNLOCKED(tsk.pi_lock),            \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
 }