summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-08 23:42:35 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-02-24 19:58:55 +0100
commitaad83b143008e1d406248803550bfbfc600b6398 (patch)
tree4cd3cac6a00cc18c29a0d730a35240aff3ebeb62
parentf1a2003e22f6b50ea21f7f4b38b38c5ebc9c8017 (diff)
downloadlinux-3.10-aad83b143008e1d406248803550bfbfc600b6398.tar.gz
linux-3.10-aad83b143008e1d406248803550bfbfc600b6398.tar.bz2
linux-3.10-aad83b143008e1d406248803550bfbfc600b6398.zip
ACPI / PM: acpi_hibernation_enter() need not switch interrupts off
The function acpi_hibernation_enter() is always called with interrupts off, so it doesn't need to switch them off and on. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--drivers/acpi/sleep.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 0a81bf11f47..84f57143ad7 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -457,16 +457,13 @@ static int acpi_hibernation_begin(void)
static int acpi_hibernation_enter(void)
{
acpi_status status = AE_OK;
- unsigned long flags = 0;
ACPI_FLUSH_CPU_CACHE();
- local_irq_save(flags);
/* This shouldn't return. If it returns, we have a problem */
status = acpi_enter_sleep_state(ACPI_STATE_S4);
/* Reprogram control registers and execute _BFS */
acpi_leave_sleep_state_prep(ACPI_STATE_S4);
- local_irq_restore(flags);
return ACPI_SUCCESS(status) ? 0 : -EFAULT;
}