diff options
| author | Luck, Tony <tony.luck@intel.com> | 2012-04-03 09:37:28 -0700 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-18 18:56:00 +0530 |
| commit | 77d7f6a73e0698ab47bfb21b42fb66e877e0ff03 (patch) | |
| tree | f378c2df29a5f533faccdf724d74e753d95e8651 /drivers/acpi | |
| parent | 8db8e57970e20b8867057bc9187f331ef2412809 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f5c7712d1ad3..5bc828bcfdbf 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -784,7 +784,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() */ |