diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 01:43:21 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 01:43:21 +0200 |
commit | 75b56ec294b074d70f8a676ab02611a3fea76cab (patch) | |
tree | d5299adb43ac6fc8dcc50c3e438c7f0cdd452b1c /kernel/fork.c | |
parent | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | lockdep: Fix lockdep_no_validate against IRQ states (diff) | |
download | linux-75b56ec294b074d70f8a676ab02611a3fea76cab.tar.xz linux-75b56ec294b074d70f8a676ab02611a3fea76cab.zip |
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.c | 2 |
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) { raw_spin_lock_init(&p->pi_lock); #ifdef CONFIG_RT_MUTEXES - plist_head_init_raw(&p->pi_waiters, &p->pi_lock); + plist_head_init(&p->pi_waiters); p->pi_blocked_on = NULL; #endif } |