Re: [PATCH] swswsup: return correct load_image error

[Con Kolivas <kernel@kolivas.org>]

> On Tuesday 21 March 2006 10:22, Rafael J. Wysocki wrote:
> > Basically, yes.  swsusp.c and snapshot.c contain common functions,
> > disk.c and swap.c contain the code used by the built-in swsusp only,
> > and user.c contains the userland interface.  If you want something to
> > be run by the built-in swsusp only, place it in disk.c.

Would this patch suffice?

Cheers,
Con
---
Swsusp reclaims a lot of memory during the suspend cycle and can benefit
from the aggressive_swap_prefetch mode immediately upon resuming.

Signed-off-by: Con Kolivas <kernel@kolivas.org>
---
 kernel/power/disk.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

Index: linux-2.6.16-mm1/kernel/power/disk.c
===================================================================
--- linux-2.6.16-mm1.orig/kernel/power/disk.c	2006-03-24 15:48:14.000000000 +1100
+++ linux-2.6.16-mm1/kernel/power/disk.c	2006-03-24 16:15:05.000000000 +1100
@@ -19,6 +19,7 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/pm.h>
+#include <linux/swap-prefetch.h>
 
 #include "power.h"
 
@@ -138,8 +139,10 @@ int pm_suspend_disk(void)
 			unprepare_processes();
 			return error;
 		}
-	} else
+	} else {
 		pr_debug("PM: Image restored successfully.\n");
+		aggressive_swap_prefetch();
+	}
 
 	swsusp_free();
  Done: