diff mbox

[5/5] cpuidle: stop depending on pm_idle --build break

Message ID 4E3BDF8A.5090103@linux.vnet.ibm.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Deepthi Dharwar Aug. 5, 2011, 12:18 p.m. UTC 
Following is a patch required to compile on arm
and sh with the latest cpuidle cleanup changes. 

Signed-off-by: Deepthi Dharwar <deepthi@linux.vnet.ibm.com>
Signed-off-by: Trinabh Gupta <trinabh@linux.vnet.ibm.com>
diff mbox

Patch

Index: linux/arch/arm/kernel/process.c
===================================================================
--- linux.orig/arch/arm/kernel/process.c        2011-08-05 11:02:59.000000000 +0000
+++ linux/arch/arm/kernel/process.c     2011-08-05 11:10:03.000000000 +0000
@@ -197,7 +197,7 @@ 
                                cpu_relax();
                        } else {
                                stop_critical_timings();
-                               if (cpuidle_call_idle())
+                               if (cpuidle_idle_call())
                                        pm_idle();
                                start_critical_timings();
                                /*
Index: linux/arch/sh/kernel/idle.c
===================================================================
--- linux.orig/arch/sh/kernel/idle.c    2011-08-05 11:02:59.000000000 +0000
+++ linux/arch/sh/kernel/idle.c 2011-08-05 11:13:23.000000000 +0000
@@ -101,7 +101,7 @@ 
                        local_irq_disable();
                        /* Don't trace irqs off for idle */
                        stop_critical_timings();
-                       if (cpuidle_call_idle())
+                       if (cpuidle_idle_call())
                                pm_idle();
                        /*
                         * Sanity check to ensure that pm_idle() returns