1 files changed, 14 insertions, 20 deletions

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 972df0ffd4dc..2db8cc691bf4 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -39,7 +39,6 @@
 #include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
-#include <linux/cpuidle.h>
 #include <linux/of.h>
 #include <linux/kexec.h>
 
@@ -356,29 +355,24 @@ early_initcall(alloc_dispatch_log_kmem_cache);
 
 static void pseries_lpar_idle(void)
 {
-        /* This would call on the cpuidle framework, and the back-end pseries
-         * driver to  go to idle states
+        /*
+         * Default handler to go into low thread priority and possibly
+         * low power mode by cedeing processor to hypervisor
          */
-        if (cpuidle_idle_call()) {
-                /* On error, execute default handler
-                 * to go into low thread priority and possibly
-                 * low power mode by cedeing processor to hypervisor
-                 */
 
-                /* Indicate to hypervisor that we are idle. */
-                get_lppaca()->idle = 1;
+        /* Indicate to hypervisor that we are idle. */
+        get_lppaca()->idle = 1;
 
-                /*
-                 * Yield the processor to the hypervisor.  We return if
-                 * an external interrupt occurs (which are driven prior
-                 * to returning here) or if a prod occurs from another
-                 * processor. When returning here, external interrupts
-                 * are enabled.
-                 */
-                cede_processor();
+        /*
+         * Yield the processor to the hypervisor.  We return if
+         * an external interrupt occurs (which are driven prior
+         * to returning here) or if a prod occurs from another
+         * processor. When returning here, external interrupts
+         * are enabled.
+         */
+        cede_processor();
 
-                get_lppaca()->idle = 0;
-        }
+        get_lppaca()->idle = 0;
 }
 
 /*