Skip to content

Commit

Permalink
ACPI processor: Use safe_halt() rather than halt() in acpi_idle_play_…
Browse files Browse the repository at this point in the history
…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 <[email protected]>
Tested-by: Boris Ostrovsky <[email protected]>
Signed-off-by: Len Brown <[email protected]>
  • Loading branch information
aegl authored and lenb committed Apr 5, 2012
1 parent 1a022e3 commit 54f7007
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/acpi/processor_idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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() */
Expand Down

0 comments on commit 54f7007

Please sign in to comment.