On 22 October 2013 11:35, <al.stone@linaro.org> wrote:
From: Al Stone <ahs3@redhat.com>

Signed-off-by: Al Stone <al.stone@linaro.org>

Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
 
---
 drivers/acpi/processor_idle.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 587f3cf..e45f913 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -760,6 +760,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);
@@ -767,9 +768,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) {
@@ -777,13 +775,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
--
1.8.3.1


_______________________________________________
Linaro-acpi mailing list
Linaro-acpi@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-acpi