From 0eeace2329fcd2be36550029181340190126f397 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 25 Jun 2005 14:55:09 -0700
Subject: [PATCH] --- yaml --- r: 3245 b: refs/heads/master c:
 648be3188135add682349e86d46d07cc11c8eb57 h: refs/heads/master i:   3243:
 5648c991313d5550ebf53eacd46123b3138cbb6d v: v3

---
 [refs]                    | 2 +-
 trunk/arch/i386/defconfig | 1 -
 trunk/arch/i386/mm/init.c | 2 +-
 trunk/mm/page_io.c        | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bb22b3176f15..b25515251a3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc5fb2c609c6acef15a8b062063e9135fb08b4d2
+refs/heads/master: 648be3188135add682349e86d46d07cc11c8eb57
diff --git a/trunk/arch/i386/defconfig b/trunk/arch/i386/defconfig
index 28e620383799..ca07b95c06b8 100644
--- a/trunk/arch/i386/defconfig
+++ b/trunk/arch/i386/defconfig
@@ -126,7 +126,6 @@ CONFIG_HAVE_DEC_LOCK=y
 #
 CONFIG_PM=y
 CONFIG_SOFTWARE_SUSPEND=y
-# CONFIG_PM_DISK is not set
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support
diff --git a/trunk/arch/i386/mm/init.c b/trunk/arch/i386/mm/init.c
index 3672e2ef51ae..12216b52e28b 100644
--- a/trunk/arch/i386/mm/init.c
+++ b/trunk/arch/i386/mm/init.c
@@ -352,7 +352,7 @@ static void __init pagetable_init (void)
 #endif
 }
 
-#if defined(CONFIG_PM_DISK) || defined(CONFIG_SOFTWARE_SUSPEND)
+#ifdef CONFIG_SOFTWARE_SUSPEND
 /*
  * Swap suspend & friends need this for resume because things like the intel-agp
  * driver might have split up a kernel 4MB mapping.
diff --git a/trunk/mm/page_io.c b/trunk/mm/page_io.c
index 667c76df1ec2..2e605a19ce57 100644
--- a/trunk/mm/page_io.c
+++ b/trunk/mm/page_io.c
@@ -127,7 +127,7 @@ int swap_readpage(struct file *file, struct page *page)
 	return ret;
 }
 
-#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_PM_DISK)
+#ifdef CONFIG_SOFTWARE_SUSPEND
 /*
  * A scruffy utility function to read or write an arbitrary swap page
  * and wait on the I/O.  The caller must have a ref on the page.