[PATCH] [44/48] Suspend2 2.1.9.8 for 2.6.12: 620-userui.patch

Nigel Cunningham
2005-07-06T04:00:16Z

diff -ruNp 621-swsusp-tidy.patch-old/kernel/power/swsusp.c 621-swsusp-tidy.patch-new/kernel/power/swsusp.c
--- 621-swsusp-tidy.patch-old/kernel/power/swsusp.c 2005-06-20 11:47:31.000000000 +1000
+++ 621-swsusp-tidy.patch-new/kernel/power/swsusp.c 2005-07-04 23:14:19.000000000 +1000
@@ -36,6 +36,8 @@
* For TODOs,FIXMEs also look in Documentation/power/swsusp.txt
*/

+#define KERNEL_POWER_SWSUSP_C
+
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/suspend.h>
@@ -51,9 +53,7 @@
#include <linux/keyboard.h>
#include <linux/spinlock.h>
#include <linux/genhd.h>
-#include <linux/kernel.h>
#include <linux/major.h>
-#include <linux/swap.h>
#include <linux/pm.h>
#include <linux/device.h>
#include <linux/buffer_head.h>
@@ -71,9 +71,7 @@
#include <asm/io.h>

#include "power.h"
-
-/* References to section boundaries */
-extern const void __nosave_begin, __nosave_end;
+#include "suspend.h"

/* Variables to be preserved over suspend */
static int nr_copy_pages_check;