Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 include/linux/suspend.h |    2 ++
 init/do_mounts.c        |   18 ++++++++++++++++++
 kernel/power/disk.c     |   22 ++++++++++++++++++----
 3 files changed, 38 insertions(+), 4 deletions(-)

Index: 2.6/include/linux/suspend.h
===================================================================
--- 2.6.orig/include/linux/suspend.h	2007-04-27 14:43:13.000000000 +0300
+++ 2.6/include/linux/suspend.h	2007-04-27 14:43:56.000000000 +0300
@@ -61,4 +61,6 @@ #define PAGES_FOR_IO	1024
 #define POSS_NOSAVE
 #endif
 
+extern int software_resume(void);
+
 #endif /* _LINUX_SWSUSP_H */
Index: 2.6/init/do_mounts.c
===================================================================
--- 2.6.orig/init/do_mounts.c	2007-04-27 14:43:55.000000000 +0300
+++ 2.6/init/do_mounts.c	2007-04-27 14:43:56.000000000 +0300
@@ -440,9 +440,27 @@ 		if (strncmp(root_device_name, "/dev/",
 
 	is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR;
 
+	/* Suspend2:
+	 * By this point, suspend_early_init has been called to initialise our
+	 * sysfs interface. If modules are built in, they have registered (all
+	 * of the above via initcalls).
+	 *
+	 * We have not yet looked to see if an image exists, however. If we
+	 * have an initrd, it is expected that the user will have set it up
+	 * to echo > /sys/power/suspend2/do_resume and thus initiate any
+	 * resume. If they don't do that, we do it immediately after the initrd
+	 * is finished (major issues if they mount filesystems rw from the
+	 * initrd! - they are warned. If there's no usable initrd, we do our
+	 * check next.
+	 */
 	if (initrd_load())
 		goto out;
 
+#ifdef CONFIG_SUSPEND2
+	if (test_suspend_state(SUSPEND_RESUME_NOT_DONE))
+		software_resume();
+#endif
+
 	if (is_floppy && rd_doload && rd_load_disk(0))
 		ROOT_DEV = Root_RAM0;
 
Index: 2.6/kernel/power/disk.c
===================================================================
--- 2.6.orig/kernel/power/disk.c	2007-04-27 14:42:13.000000000 +0300
+++ 2.6/kernel/power/disk.c	2007-04-27 14:43:56.000000000 +0300
@@ -24,6 +24,7 @@  * Copyright (c) 2004 Pavel Machek <pave
 
 #include "power.h"
 
+#include "suspend.h"
 
 static int noresume = 0;
 char resume_file[256] = CONFIG_PM_STD_PARTITION;
@@ -118,6 +119,11 @@ int pm_suspend_disk(void)
 {
 	int error;
 
+#ifdef CONFIG_SUSPEND2
+	if (test_action_state(SUSPEND_REPLACE_SWSUSP))
+		return suspend2_try_suspend(1);
+#endif
+
 	error = prepare_processes();
 	if (error)
 		return error;
@@ -200,10 +206,20 @@ 		mdelay(5000);
  *
  */
 
-static int software_resume(void)
+int software_resume(void)
 {
 	int error;
 
+#ifdef CONFIG_SUSPEND2
+	/*
+	 * We can't know (until an image header - if any - is loaded), whether
+	 * we did override swsusp. We therefore ensure that both are tried.
+	 */
+	if (test_action_state(SUSPEND_REPLACE_SWSUSP))
+		printk("Replacing swsusp.\n");
+		suspend2_try_resume();
+#endif
+
 	mutex_lock(&pm_mutex);
 	if (!swsusp_resume_device) {
 		if (!strlen(resume_file)) {
@@ -274,9 +290,6 @@ 		return 0;
 	return 0;
 }
 
-late_initcall(software_resume);
-
-
 static const char * const pm_disk_modes[] = {
 	[PM_DISK_FIRMWARE]	= "firmware",
 	[PM_DISK_PLATFORM]	= "platform",
@@ -457,6 +470,7 @@ static int __init resume_offset_setup(ch
 static int __init noresume_setup(char *str)
 {
 	noresume = 1;
+	set_suspend_state(SUSPEND_NORESUME_SPECIFIED);
 	return 1;
 }