summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2012-04-03 09:37:28 -0700
committerLen Brown <len.brown@intel.com>2012-04-05 13:41:44 -0400
commit54f70077768e9aba37d9c5030b43497b6d5084fb (patch)
treeefdb4d473df2d3d70c38b619e7ff77c9e8beea51 /drivers/acpi
parent1a022e3f1be11730bd8747b1af96a0274bf6356e (diff)
downloadlinux-stable-54f70077768e9aba37d9c5030b43497b6d5084fb.tar.gz
linux-stable-54f70077768e9aba37d9c5030b43497b6d5084fb.tar.bz2
linux-stable-54f70077768e9aba37d9c5030b43497b6d5084fb.zip
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_idle.c2
1 files changed, 1 insertions, 1 deletions
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() */