Messages in this thread Patch in this message |  | | | From | "Rafael J. Wysocki" <> | | Subject | [PATCH 2/4] swsusp: clean up resume error path | | Date | Mon, 17 Oct 2005 23:50:04 +0200 |
| |
The following patch removes an incorrect call to restore_highmem() from the resume error path (there's no saved highmem in that case) and makes swsusp touch the softlockup watchdog if there's no error (currently it only touches the watchdog if an error occurs).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Index: linux-2.6.14-rc4-mm1/kernel/power/swsusp.c =================================================================== --- linux-2.6.14-rc4-mm1.orig/kernel/power/swsusp.c 2005-10-17 23:28:34.000000000 +0200 +++ linux-2.6.14-rc4-mm1/kernel/power/swsusp.c 2005-10-17 23:28:47.000000000 +0200 @@ -604,6 +604,7 @@ /* Restore control flow magically appears here */ restore_processor_state(); restore_highmem(); + touch_softlockup_watchdog(); device_power_up(); local_irq_enable(); return error; @@ -628,7 +629,6 @@ */ swsusp_free(); restore_processor_state(); - restore_highmem(); touch_softlockup_watchdog(); device_power_up(); local_irq_enable(); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |