diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-06 19:56:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-06 19:56:04 -0700 |
commit | f21fec96ead90eae7bcb3c847e8115c119c5dc62 (patch) | |
tree | d60a74cc16aab57f5c8a4a496f0c6e9f33848d45 /drivers/acpi | |
parent | a0421da44fc8dcb94aad8889dae285f7ee923f80 (diff) | |
parent | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (diff) | |
download | blackbird-op-linux-f21fec96ead90eae7bcb3c847e8115c119c5dc62.tar.gz blackbird-op-linux-f21fec96ead90eae7bcb3c847e8115c119c5dc62.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull ACPI & Power Management patches from Len Brown:
"Two fixes for cpuidle merge-window changes, plus a URL fix in
MAINTAINERS"
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
MAINTAINERS: Update git url for ACPI
cpuidle: Fix panic in CPU off-lining with no idle driver
ACPI processor: Use safe_halt() rather than halt() in acpi_idle_play_dead()
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 b3447f63e46b..f3decb30223f 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() */ |