diff --git a/[refs] b/[refs] index 7f7498d41065..b610e5798d49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91b943ee4afa2037678dc1db30b89baef0e17090 +refs/heads/master: bea493a031fe3337f4fe5479e8e865513828ea76 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 7dc6140baac6..29ebb30850ed 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -984,6 +984,8 @@ static struct task_struct *copy_process(unsigned long clone_flags, if (!p) goto fork_out; + rt_mutex_init_task(p); + #ifdef CONFIG_TRACE_IRQFLAGS DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); @@ -1088,8 +1090,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->lockdep_recursion = 0; #endif - rt_mutex_init_task(p); - #ifdef CONFIG_DEBUG_MUTEXES p->blocked_on = NULL; /* not blocked yet */ #endif