|
@@ -2510,13 +2510,11 @@ void __sched schedule_preempt_disabled(void)
|
|
|
*/
|
|
|
asmlinkage void __sched notrace preempt_schedule(void)
|
|
|
{
|
|
|
- struct thread_info *ti = current_thread_info();
|
|
|
-
|
|
|
/*
|
|
|
* If there is a non-zero preempt_count or interrupts are disabled,
|
|
|
* we do not want to preempt the current task. Just return..
|
|
|
*/
|
|
|
- if (likely(ti->preempt_count || irqs_disabled()))
|
|
|
+ if (likely(!preemptible()))
|
|
|
return;
|
|
|
|
|
|
do {
|