aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/fork.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 19:43:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 19:43:21 -0400
commit75b56ec294b074d70f8a676ab02611a3fea76cab (patch)
treed5299adb43ac6fc8dcc50c3e438c7f0cdd452b1c /kernel/fork.c
parent6d16d6d9bb6f93e6f8506cfb3e91795d6443d54f (diff)
parentefbe2eee6dc0f179be84292bf269528b3ec365e9 (diff)
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: Fix lockdep_no_validate against IRQ states mutex: Make mutex_destroy() an inline function plist: Remove the need to supply locks to plist heads lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 4d4117e01504..ca339c5c5819 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1012,7 +1012,7 @@ static void rt_mutex_init_task(struct task_struct *p)
1012{ 1012{
1013 raw_spin_lock_init(&p->pi_lock); 1013 raw_spin_lock_init(&p->pi_lock);
1014#ifdef CONFIG_RT_MUTEXES 1014#ifdef CONFIG_RT_MUTEXES
1015 plist_head_init_raw(&p->pi_waiters, &p->pi_lock); 1015 plist_head_init(&p->pi_waiters);
1016 p->pi_blocked_on = NULL; 1016 p->pi_blocked_on = NULL;
1017#endif 1017#endif
1018} 1018}