diff options
| author | Al Stone <ahs3@redhat.com> | 2013-10-21 21:35:35 -0600 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-11-19 10:30:44 +0000 |
| commit | 5060a8b5b9ad334727b781afe4e8e5f2681c8cfc (patch) | |
| tree | cc7387e3038f022672831ca96e73609a9f325037 | |
| parent | 0b9c230100c6166ebac18fa3b126776ecf909db5 (diff) | |
| download | leg-kernel-5060a8b5b9ad334727b781afe4e8e5f2681c8cfc.tar.gz | |
ACPI: ARM: stub out acpi_idle_play_dead properly
Signed-off-by: Al Stone <al.stone@linaro.org>
Reviewed-by: Hanjun Guo <[4]hanjun.guo@linaro.org>
| -rw-r--r-- | drivers/acpi/processor_idle.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 6ff9b57f21c4..0ff1927ce29a 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -763,6 +763,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev, * @dev: the target CPU * @index: the index of suggested state */ +#ifdef CONFIG_X86 static int acpi_idle_play_dead(struct cpuidle_device *dev, int index) { struct acpi_processor_cx *cx = per_cpu(acpi_cstate[index], dev->cpu); @@ -770,9 +771,6 @@ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index) ACPI_FLUSH_CPU_CACHE(); while (1) { - -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ if (cx->entry_method == ACPI_CSTATE_HALT) safe_halt(); else if (cx->entry_method == ACPI_CSTATE_SYSTEMIO) { @@ -780,13 +778,18 @@ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index) /* See comment in acpi_idle_do_entry() */ inl(acpi_gbl_FADT.xpm_timer_block.address); } else -#endif return -ENODEV; } /* Never reached */ return 0; } +#else +static int acpi_idle_play_dead(struct cpuidle_device *dev, int index) +{ + return 0; +} +#endif /** * acpi_idle_enter_simple - enters an ACPI state without BM handling |