Suspend to RAM on a machine with / on a fuse filesystem turns out to be

a screaming nightmare - either the suspend fails because syslog (for

instance) can't be frozen, or the machine deadlocks for some other

reason I haven't tracked down. We could "fix" fuse, or alternatively we

could do what we do for suspend to RAM on other platforms (PPC and APM)

and just not use the freezer.
Signed-off-by: Matthew Garrett 
diff --git a/kernel/power/main.c b/kernel/power/main.c

index 8812985..5f109d5 100644

--- a/kernel/power/main.c

+++ b/kernel/power/main.c

@@ -19,7 +19,6 @@

 #include

 #include

 #include

-#include

 #include 
 #include "power.h"

@@ -81,11 +80,6 @@ static int suspend_prepare(suspend_state_t state)
 	pm_prepare_console();
-	if (freeze_processes()) {

-		error = -EAGAIN;

-		goto Thaw;

-	}

-

 	if ((free_pages = global_page_state(NR_FREE_PAGES))

 			< FREE_PAGE_NUMBER) {

 		pr_debug("PM: free some memory\n");

@@ -93,7 +87,7 @@ static int suspend_prepare(suspend_state_t state)

 		if (nr_free_pages() < FREE_PAGE_NUMBER) {

 			error = -ENOMEM;

 			printk(KERN_ERR "PM: No enough memory\n");

-			goto Thaw;

+			goto Restore_console;

 		}

 	}
@@ -118,8 +112,7 @@ static int suspend_prepare(suspend_state_t state)

 	device_resume();

  Resume_console:

 	resume_console();

- Thaw:

-	thaw_processes();

+ Restore_console:

 	pm_restore_console();

 	return error;

 }

@@ -170,7 +163,6 @@ static void suspend_finish(suspend_state_t state)

 	pm_finish(state);

 	device_resume();

 	resume_console();

-	thaw_processes();

 	pm_restore_console();

 }
--

Matthew Garrett | mjg59@srcf.ucam.org

-

unsubscribe notice
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/