diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-04-29 17:41:09 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-04-29 17:41:45 +0700 |
| commit | 8966a0af43e954331e92bb53b9c09111d01117b8 (patch) | |
| tree | 1090f15bcb4b9c8d2a0bad9d90222728f184ccd6 /kernel/sched.c | |
| parent | b429ec3fd774ebb511a76377caebbbafe5e1ae9f (diff) | |
| parent | b47833937231eebab2fe46502426ea8158fae8d9 (diff) | |
| download | kernel_samsung_aries-8966a0af43e954331e92bb53b9c09111d01117b8.zip kernel_samsung_aries-8966a0af43e954331e92bb53b9c09111d01117b8.tar.gz kernel_samsung_aries-8966a0af43e954331e92bb53b9c09111d01117b8.tar.bz2 | |
Merge 3.0.75
Change-Id: Iefad0afd76773f4a9556775cd0fa8dcacb135cdf
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 89a9c34..dee8763 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2744,8 +2744,10 @@ static void try_to_wake_up_local(struct task_struct *p) { struct rq *rq = task_rq(p); - BUG_ON(rq != this_rq()); - BUG_ON(p == current); + if (WARN_ON_ONCE(rq != this_rq()) || + WARN_ON_ONCE(p == current)) + return; + lockdep_assert_held(&rq->lock); if (!raw_spin_trylock(&p->pi_lock)) { |