3 files changed, 56 insertions, 51 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 1506d69b3f0f..166a7322a2b6 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -173,55 +173,6 @@ void cpuidle_reflect(struct cpuidle_device *dev, int index)
 }
 
 /**
- * cpuidle_idle_call - the main idle loop
- *
- * NOTE: no locks or semaphores should be used here
- * return non-zero on failure
- */
-int cpuidle_idle_call(void)
-{
-        struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
-        struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
-        int next_state, entered_state, ret;
-        bool broadcast;
-
-        ret = cpuidle_enabled(drv, dev);
-        if (ret < 0)
-                return ret;
-
-        /* ask the governor for the next state */
-        next_state = cpuidle_select(drv, dev);
-
-        if (need_resched()) {
-                dev->last_residency = 0;
-                /* give the governor an opportunity to reflect on the outcome */
-                cpuidle_reflect(dev, next_state);
-                local_irq_enable();
-                return 0;
-        }
-
-        broadcast = !!(drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP);
-
-        if (broadcast &&
-            clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu))
-                return -EBUSY;
-
-        trace_cpu_idle_rcuidle(next_state, dev->cpu);
-
-        entered_state = cpuidle_enter(drv, dev, next_state);
-
-        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
-
-        if (broadcast)
-                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
-
-        /* give the governor an opportunity to reflect on the outcome */
-        cpuidle_reflect(dev, entered_state);
-
-        return 0;
-}
-
-/**
  * cpuidle_install_idle_handler - installs the cpuidle idle loop handler
  */
 void cpuidle_install_idle_handler(void)
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index accc2dd72049..8d97962d6d64 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -128,7 +128,6 @@ extern int cpuidle_enter(struct cpuidle_driver *drv,
                          struct cpuidle_device *dev, int index);
 extern void cpuidle_reflect(struct cpuidle_device *dev, int index);
 
-extern int cpuidle_idle_call(void);
 extern int cpuidle_register_driver(struct cpuidle_driver *drv);
 extern struct cpuidle_driver *cpuidle_get_driver(void);
 extern struct cpuidle_driver *cpuidle_driver_ref(void);
@@ -160,7 +159,6 @@ static inline int cpuidle_enter(struct cpuidle_driver *drv,
                                 struct cpuidle_device *dev, int index)
 {return -ENODEV; }
 static inline void cpuidle_reflect(struct cpuidle_device *dev, int index) { }
-static inline int cpuidle_idle_call(void) { return -ENODEV; }
 static inline int cpuidle_register_driver(struct cpuidle_driver *drv)
 {return -ENODEV; }
 static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; }
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index b7976a127178..d5aaf5eb4531 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -63,6 +63,62 @@ void __weak arch_cpu_idle(void)
         local_irq_enable();
 }
 
+#ifdef CONFIG_CPU_IDLE
+/**
+ * cpuidle_idle_call - the main idle function
+ *
+ * NOTE: no locks or semaphores should be used here
+ * return non-zero on failure
+ */
+static int cpuidle_idle_call(void)
+{
+        struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
+        struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
+        int next_state, entered_state, ret;
+        bool broadcast;
+
+        ret = cpuidle_enabled(drv, dev);
+        if (ret < 0)
+                return ret;
+
+        /* ask the governor for the next state */
+        next_state = cpuidle_select(drv, dev);
+
+        if (need_resched()) {
+                dev->last_residency = 0;
+                /* give the governor an opportunity to reflect on the outcome */
+                cpuidle_reflect(dev, next_state);
+                local_irq_enable();
+                return 0;
+        }
+
+        broadcast = !!(drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP);
+
+        if (broadcast &&
+            clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu))
+                return -EBUSY;
+
+        trace_cpu_idle_rcuidle(next_state, dev->cpu);
+
+        entered_state = cpuidle_enter(drv, dev, next_state);
+
+        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
+
+        if (broadcast)
+                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
+
+        /* give the governor an opportunity to reflect on the outcome */
+        cpuidle_reflect(dev, entered_state);
+
+        return 0;
+}
+#else
+static inline int cpuidle_idle_call(void)
+{
+        return -ENODEV;
+}
+#endif
+
 /*
  * Generic idle loop implementation
  */