ide: fix UDMA/MWDMA/SWDMA masks (v3)

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

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 6383d2d..7951023 100644 (file)
--- 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},                                         \
 }
 
@@ -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                                                    \
 }