mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to queue up a dependent patch. Also update to
later -rc's.
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
commit
ae7f6711d6
669 changed files with 18382 additions and 4845 deletions
|
|
@ -5536,8 +5536,11 @@ need_resched_nonpreemptible:
|
|||
|
||||
post_schedule(rq);
|
||||
|
||||
if (unlikely(reacquire_kernel_lock(current) < 0))
|
||||
if (unlikely(reacquire_kernel_lock(current) < 0)) {
|
||||
prev = rq->curr;
|
||||
switch_count = &prev->nivcsw;
|
||||
goto need_resched_nonpreemptible;
|
||||
}
|
||||
|
||||
preempt_enable_no_resched();
|
||||
if (need_resched())
|
||||
|
|
|
|||
Loading…
Reference in a new issue