Commit f57a9b9f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] swsusp: fix error handling in "not enough swap space"

From: Pavel Machek <pavel@ucw.cz>

Without this, if there's not enough swapspace, suspend fails, but leaves
devices suspended, leading to dead machine.
parent f2825db1
...@@ -673,7 +673,11 @@ asmlinkage void do_magic_suspend_2(void) ...@@ -673,7 +673,11 @@ asmlinkage void do_magic_suspend_2(void)
free_pages((unsigned long) pagedir_nosave, pagedir_order); free_pages((unsigned long) pagedir_nosave, pagedir_order);
spin_unlock_irq(&suspend_pagedir_lock); spin_unlock_irq(&suspend_pagedir_lock);
device_resume();
PRINTK( "Fixing swap signatures... " );
mark_swapfiles(((swp_entry_t) {0}), MARK_SWAP_RESUME); mark_swapfiles(((swp_entry_t) {0}), MARK_SWAP_RESUME);
PRINTK( "ok\n" );
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment