From 529532f2d308dc2e363acc36285e4f09505d6928 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 8 Feb 2011 23:42:35 +0100 Subject: [PATCH] --- yaml --- r: 241681 b: refs/heads/master c: aad83b143008e1d406248803550bfbfc600b6398 h: refs/heads/master i: 241679: 2da3c85cc59ecc2a6a3445717a3faef8479ca18d v: v3 --- [refs] | 2 +- trunk/drivers/acpi/sleep.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 450ad0adc415..5e905150bebe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1a2003e22f6b50ea21f7f4b38b38c5ebc9c8017 +refs/heads/master: aad83b143008e1d406248803550bfbfc600b6398 diff --git a/trunk/drivers/acpi/sleep.c b/trunk/drivers/acpi/sleep.c index 0a81bf11f473..84f57143ad7c 100644 --- a/trunk/drivers/acpi/sleep.c +++ b/trunk/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; }