On 02/06/2014 07:46 PM, Nicolas Pitre wrote:
The core idle loop now takes care of it.
Signed-off-by: Nicolas Pitre nico@linaro.org
arch/powerpc/platforms/powernv/setup.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c index 21166f65c9..a932feb290 100644 --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c @@ -26,7 +26,6 @@ #include <linux/of_fdt.h> #include <linux/interrupt.h> #include <linux/bug.h> -#include <linux/cpuidle.h>
#include <asm/machdep.h> #include <asm/firmware.h> @@ -217,16 +216,6 @@ static int __init pnv_probe(void) return 1; }
-void powernv_idle(void) -{
- /* Hook to cpuidle framework if available, else
* call on default platform idle code*/- if (cpuidle_idle_call()) {
power7_idle();- }
-}
define_machine(powernv) { .name = "PowerNV", .probe = pnv_probe, @@ -236,7 +225,7 @@ define_machine(powernv) { .show_cpuinfo = pnv_show_cpuinfo, .progress = pnv_progress, .machine_shutdown = pnv_shutdown,
- .power_save = powernv_idle,
- .power_save = power7_idle, .calibrate_decr = generic_calibrate_decr,
#ifdef CONFIG_KEXEC .kexec_cpu_down = pnv_kexec_cpu_down,
Reviewed-by: Preeti U Murthy preeti@linux.vnet.ibm.com