ACPI processor: Use safe_halt() rather than halt() in acpi_idle_play_dead()
authorLuck, Tony <tony.luck@intel.com>
Tue, 3 Apr 2012 16:37:28 +0000 (09:37 -0700)
committerLen Brown <len.brown@intel.com>
Thu, 5 Apr 2012 17:41:44 +0000 (13:41 -0400)
ACPI code is shared by arch/x86 and arch/ia64. ia64 doesn't provide a plain
"halt()" function.  Use safe_halt() instead.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@amd.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/processor_idle.c

index 6b1d32a161aefb4c5f3e39b9d386a8361a91718d..784f9a7beb1731cda846e3256b6bc85f378982a8 100644 (file)
@@ -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() */