diff -ruN 820-to-reverse-old/arch/i386/power/cpu.c 820-to-reverse-new/arch/i386/power/cpu.c
--- 820-to-reverse-old/arch/i386/power/cpu.c	2004-11-03 21:54:42.000000000 +1100
+++ 820-to-reverse-new/arch/i386/power/cpu.c	2004-11-04 16:27:41.000000000 +1100
@@ -25,6 +25,7 @@
 #include <asm/uaccess.h>
 #include <asm/acpi.h>
 #include <asm/tlbflush.h>
+#include <asm/desc.h>
 
 static struct saved_context saved_context;
 
@@ -34,6 +35,10 @@
 unsigned long saved_context_esi, saved_context_edi;
 unsigned long saved_context_eflags;
 
+/* Special page directory for resume */
+extern char __nosavedata swsusp_pg_dir[PAGE_SIZE]
+                  __attribute__ ((aligned (PAGE_SIZE)));
+
 extern void enable_sep_cpu(void *);
 
 void __save_processor_state(struct saved_context *ctxt)
diff -ruN 820-to-reverse-old/drivers/block/loop.c 820-to-reverse-new/drivers/block/loop.c
--- 820-to-reverse-old/drivers/block/loop.c	2004-11-03 21:53:49.000000000 +1100
+++ 820-to-reverse-new/drivers/block/loop.c	2004-11-04 16:27:41.000000000 +1100
@@ -63,7 +63,6 @@
 #include <linux/swap.h>
 #include <linux/slab.h>
 #include <linux/loop.h>
-#include <linux/suspend.h>
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>		/* for invalidate_bdev() */
 #include <linux/completion.h>
