diff -ruN 1922/include/linux/suspend-debug.h 1923/include/linux/suspend-debug.h
--- 1922/include/linux/suspend-debug.h	2003-04-23 11:06:58.000000000 +1200
+++ 1923/include/linux/suspend-debug.h	2003-04-23 11:32:52.000000000 +1200
@@ -6,7 +6,7 @@
 
 #define name_suspend "Suspend Machine:  "
 #define name_resume  "Resume Machine:   "
-#define swsusp_version "beta 19-22"
+#define swsusp_version "beta 19-23"
 #define name_swsusp  "Swsusp " swsusp_version ":   "
 #define console_suspend " S U S P E N D   T O   D I S K " /* Same length to ensure one overwrites the other */
 #define console_resume  "R E S U M E   F R O M   D I S K"
@@ -40,7 +40,6 @@
 extern void printnolog(int restartline, const char *fmt, ...);
 
 #if defined(CONFIG_SOFTWARE_SUSPEND_DEBUG)
-# define PRINTTHRESH 3		/* Number of lines at the start/end of pagesets to show */
 extern int currentstage;	/* Current stage (STAGEPRINT macro) */
 # define STAGEPRINT ((currentstage == 0) || (swsusp_state[3] & currentstage))
 # define PRINTK(mask, f, a...)	((((mask) & swsusp_state[2]) && STAGEPRINT) ? printk(f, ## a):0)
diff -ruN 1922/kernel/suspend.c 1923/kernel/suspend.c
--- 1922/kernel/suspend.c	2003-04-23 10:47:54.000000000 +1200
+++ 1923/kernel/suspend.c	2003-04-23 11:09:58.000000000 +1200
@@ -314,7 +314,7 @@
 		try_to_free_buffers(bh->b_page, __GFP_FAST); \
 	free_suspend_cache_page(last_suspend_cache_page);
 
-#define PRINTFREEMEM(desn) printk("Free memory %s: %d.\n", desn, nr_free_pages())
+#define PRINTFREEMEM(desn) PRINTNOLOG(SUSPEND_VERBOSE, 1, "Free memory %s: %d.\n", desn, nr_free_pages())
 #define PANIC(f, a...) 	panic(f, ## a) 
 
 static struct sysinfo swapinfo;
@@ -434,7 +434,6 @@
 {
 	struct pbelink * link = (struct pbelink *) PBEPAGE_START(pbe);
 	link->next = next;
-	printk("Set link for pbe %p to point to %p\n", pbe, next);
 }
 
 static struct pbe * get_next_pagedir_page(struct pbe * pbe)
@@ -1237,7 +1236,7 @@
 		pbe = get_next_pbe(pbe);
 	}
 	end_time = jiffies;
-	printk("Time to write data: %d jiffies. Pages written per jiffy: %d.\n", end_time - start_time, size / (end_time - start_time));
+	PRINTK(SUSPEND_DEBUG, "Time to write data: %d jiffies. Pages written per jiffy: %d.\n", end_time - start_time, size / (end_time - start_time));
 
 #ifdef CONFIG_SOFTWARE_SUSPEND_COMPRESSION
 	if (ret != Z_STREAM_END)
@@ -1275,7 +1274,6 @@
 	struct pbe * pbe;
 #ifdef CONFIG_SOFTWARE_SUSPEND_COMPRESSION
 	int ret = 0, ret2 = 0;
-	long thisswap = 0;
 	z_stream strm;
 	struct pbe * swap_pbe;
 #endif
@@ -1308,7 +1306,6 @@
 		finish_at = MIN(pageset1_size, pageset2_size);
 	else
 		finish_at = pagedir->pageset_size;
-	printk("Going to read %d pages.\n", finish_at);
 
 #ifdef CONFIG_SOFTWARE_SUSPEND_COMPRESSION
 	if (prepare_zlib_inflate_memory()) {
@@ -1363,7 +1360,7 @@
 					abort_and_exit("Failed reading page to swap. Error number was %d.\n", ret);
 				strm.next_in = (void *) copybuff;
 				strm.avail_in = PAGE_SIZE;
-				thisswap++;
+				swap_pbe = get_next_pbe(swap_pbe);
 			}
 			ret = zlib_inflate(&strm, Z_PARTIAL_FLUSH);
 			if ( ret == Z_BUF_ERROR && strm.avail_in == 0 )
@@ -1406,7 +1403,7 @@
 	PRINTK(SUSPEND_DEBUG, "|\n");
 
 	end_time=jiffies;
-	printk("Time to read data: %d jiffies. Pages read per jiffy: %d.\n", end_time - start_time, finish_at / (end_time - start_time));
+	PRINTK(SUSPEND_DEBUG, "Time to read data: %d jiffies. Pages read per jiffy: %d.\n", end_time - start_time, finish_at / (end_time - start_time));
 
 read_pageset_free_buffers:
 	drivers_suspend();
@@ -1802,10 +1799,8 @@
 			PRINTNOLOG(SUSPEND_VERBOSE, 0, "(Get %d %p -> %lx)", i, 
 				pbe,
 				pbe->swap_address.val);
-			if (i == alloc_from) {
-				printk("Got allocated from shortcut (%p).\n", pbe);
+			if (i == alloc_from)
 				p->first_allocated = pbe;
-			}
 			pbe = get_next_pbe(pbe);
 		}
 		PRINTNOLOG(SUSPEND_VERBOSE, 0, "\n");
@@ -3230,7 +3225,8 @@
 
 	check_shift_keys(1);
 
-	read_pageset(&pagedir_nosave, 1, 0);
+	if (read_pageset(&pagedir_nosave, 1, 0))
+		return -EPERM;
 
 	PRINTK(SUSPEND_VERBOSE,"\n|\n");
 	
@@ -3308,7 +3304,7 @@
 
 	PRINTK(SUSPEND_VERBOSE,name_resume "Reading secondary pageset data (%d pages). Pagedir at %lx.\n", pageset2_size, (unsigned long) pagedir2.data);
 
-	read_pageset(&pagedir2, 2, overwrittenpagesonly);
+	result = read_pageset(&pagedir2, 2, overwrittenpagesonly);
 
 	update_status(100, 100, NULL);
 	check_shift_keys(1);