Merge branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / kernel / sched / idle.c

diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 54194d41035c25ba3e51cc5677d4575751c53c49..8bfeb6395bddb9f5c3ccc1267475b55ae7c3d086 100644 (file)
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -241,13 +241,14 @@ static void do_idle(void)
                check_pgt_cache();
                rmb();
 
+               local_irq_disable();
+
                if (cpu_is_offline(cpu)) {
-                       tick_nohz_idle_stop_tick_protected();
+                       tick_nohz_idle_stop_tick();
                        cpuhp_report_idle_dead();
                        arch_cpu_idle_dead();
                }
 
-               local_irq_disable();
                arch_cpu_idle_enter();
 
                /*
@@ -374,7 +375,7 @@ static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int fl
        resched_curr(rq);
 }
 
-static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)
+static void put_prev_task_idle(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
 {
 }
 
@@ -389,7 +390,9 @@ pick_next_task_idle(struct rq *rq, struct task_struct *prev, struct rq_flags *rf
 {
        struct task_struct *next = rq->idle;
 
-       put_prev_task(rq, prev);
+       if (prev)
+               put_prev_task(rq, prev);
+
        set_next_task_idle(rq, next);
 
        return next;