Merge commit '8700c95adb03' into timers/nohz

The full dynticks tree needs the latest RCU and sched
upstream updates in order to fix some dependencies.

Merge a common upstream merge point that has these
updates.

Conflicts:
	include/linux/perf_event.h
	kernel/rcutree.h
	kernel/rcutree_plugin.h

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

1 files changed, 4 insertions, 23 deletions

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index b462b13c5bae..bbcef522bcb1 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -210,33 +210,14 @@ void initial_thread_cb(void (*proc)(void *), void *arg)
         kmalloc_ok = save_kmalloc_ok;
 }
 
-void default_idle(void)
+void arch_cpu_idle(void)
 {
         unsigned long long nsecs;
 
-        while (1) {
-                /* endless idle loop with no priority at all */
-
-                /*
-                 * although we are an idle CPU, we do not want to
-                 * get into the scheduler unnecessarily.
-                 */
-                if (need_resched())
-                        schedule();
-
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                nsecs = disable_timer();
-                idle_sleep(nsecs);
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-        }
-}
-
-void cpu_idle(void)
-{
         cpu_tasks[current_thread_info()->cpu].pid = os_getpid();
-        default_idle();
+        nsecs = disable_timer();
+        idle_sleep(nsecs);
+        local_irq_enable();
 }
 
 int __cant_sleep(void) {