[PATCH] x86: Use safe_halt() instead of halt() in acpi_idle_play_dead()

From: Boris Ostrovsky
Date: Mon Apr 02 2012 - 14:56:36 EST


Using halt() in acpi_idle_play_dead() breaks ia64 build. Use safe_halt()
instead.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxx>
---
drivers/acpi/processor_idle.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 6b1d32a..784f9a7 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -786,7 +786,7 @@ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index)
while (1) {

if (cx->entry_method == ACPI_CSTATE_HALT)
- halt();
+ safe_halt();
else if (cx->entry_method == ACPI_CSTATE_SYSTEMIO) {
inb(cx->address);
/* See comment in acpi_idle_do_entry() */
--
1.7.3.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/