Commit 8ce08b9d authored by Thomas Gleixner's avatar Thomas Gleixner

sched: revert schedule/__schedule changes

RT wants that disctinction for now. We need to revisit this.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2f49b3e3
...@@ -5333,15 +5333,13 @@ pick_next_task(struct rq *rq) ...@@ -5333,15 +5333,13 @@ pick_next_task(struct rq *rq)
/* /*
* schedule() is the main scheduler function. * schedule() is the main scheduler function.
*/ */
asmlinkage void __sched schedule(void) asmlinkage void __sched __schedule(void)
{ {
struct task_struct *prev, *next; struct task_struct *prev, *next;
unsigned long *switch_count; unsigned long *switch_count;
struct rq *rq; struct rq *rq;
int cpu; int cpu;
need_resched:
preempt_disable();
cpu = smp_processor_id(); cpu = smp_processor_id();
rq = cpu_rq(cpu); rq = cpu_rq(cpu);
rcu_qsctr_inc(cpu); rcu_qsctr_inc(cpu);
...@@ -5399,7 +5397,13 @@ need_resched_nonpreemptible: ...@@ -5399,7 +5397,13 @@ need_resched_nonpreemptible:
if (unlikely(reacquire_kernel_lock(current) < 0)) if (unlikely(reacquire_kernel_lock(current) < 0))
goto need_resched_nonpreemptible; goto need_resched_nonpreemptible;
}
asmlinkage void __sched schedule(void)
{
need_resched:
preempt_disable();
__schedule();
__preempt_enable_no_resched(); __preempt_enable_no_resched();
if (need_resched()) if (need_resched())
goto need_resched; goto need_resched;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment