diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:43:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:43:21 -0700 |
| commit | 75b56ec294b074d70f8a676ab02611a3fea76cab (patch) | |
| tree | d5299adb43ac6fc8dcc50c3e438c7f0cdd452b1c /kernel/sched.c | |
| parent | 6d16d6d9bb6f93e6f8506cfb3e91795d6443d54f (diff) | |
| parent | efbe2eee6dc0f179be84292bf269528b3ec365e9 (diff) | |
| download | kernel-common-75b56ec294b074d70f8a676ab02611a3fea76cab.tar.gz kernel-common-75b56ec294b074d70f8a676ab02611a3fea76cab.tar.bz2 kernel-common-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/sched.c')
| -rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index fde6ff903525..c518b05fd062 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -7937,7 +7937,7 @@ static void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq) #ifdef CONFIG_SMP rt_rq->rt_nr_migratory = 0; rt_rq->overloaded = 0; - plist_head_init_raw(&rt_rq->pushable_tasks, &rq->lock); + plist_head_init(&rt_rq->pushable_tasks); #endif rt_rq->rt_time = 0; @@ -8142,7 +8142,7 @@ void __init sched_init(void) #endif #ifdef CONFIG_RT_MUTEXES - plist_head_init_raw(&init_task.pi_waiters, &init_task.pi_lock); + plist_head_init(&init_task.pi_waiters); #endif /* |