diff --git a/[refs] b/[refs] index edaac5e1ddbf..2d8467cdbfd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c080f1a93591500299a514ef63209079ff007ac +refs/heads/master: b32e41bb97971161ad34ea69364c4f9ec3909151 diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h index a2d95ff50e9b..795102309bf1 100644 --- a/trunk/include/linux/init_task.h +++ b/trunk/include/linux/init_task.h @@ -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 \ }