diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-08 17:42:35 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-24 13:58:55 -0500 |
commit | aad83b143008e1d406248803550bfbfc600b6398 (patch) | |
tree | 4cd3cac6a00cc18c29a0d730a35240aff3ebeb62 /drivers/acpi/sleep.c | |
parent | f1a2003e22f6b50ea21f7f4b38b38c5ebc9c8017 (diff) |
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>
Diffstat (limited to 'drivers/acpi/sleep.c')
-rw-r--r-- | drivers/acpi/sleep.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 0a81bf11f473..84f57143ad7c 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -457,16 +457,13 @@ static int acpi_hibernation_begin(void) | |||
457 | static int acpi_hibernation_enter(void) | 457 | static int acpi_hibernation_enter(void) |
458 | { | 458 | { |
459 | acpi_status status = AE_OK; | 459 | acpi_status status = AE_OK; |
460 | unsigned long flags = 0; | ||
461 | 460 | ||
462 | ACPI_FLUSH_CPU_CACHE(); | 461 | ACPI_FLUSH_CPU_CACHE(); |
463 | 462 | ||
464 | local_irq_save(flags); | ||
465 | /* This shouldn't return. If it returns, we have a problem */ | 463 | /* This shouldn't return. If it returns, we have a problem */ |
466 | status = acpi_enter_sleep_state(ACPI_STATE_S4); | 464 | status = acpi_enter_sleep_state(ACPI_STATE_S4); |
467 | /* Reprogram control registers and execute _BFS */ | 465 | /* Reprogram control registers and execute _BFS */ |
468 | acpi_leave_sleep_state_prep(ACPI_STATE_S4); | 466 | acpi_leave_sleep_state_prep(ACPI_STATE_S4); |
469 | local_irq_restore(flags); | ||
470 | 467 | ||
471 | return ACPI_SUCCESS(status) ? 0 : -EFAULT; | 468 | return ACPI_SUCCESS(status) ? 0 : -EFAULT; |
472 | } | 469 | } |