From: Luck, Tony <tony.luck@intel.com>
Date: Tue, 3 Apr 2012 16:37:28 +0000 (-0700)
Subject: ACPI processor: Use safe_halt() rather than halt() in acpi_idle_play_dead()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=54f70077768e9aba37d9c5030b43497b6d5084fb;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ACPI processor: Use safe_halt() rather than halt() in acpi_idle_play_dead()

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>
---

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 6b1d32a161ae..784f9a7beb17 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() */