From f099b8db7a6cf02f669143374fe3139df8d08104 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Wed, 6 Sep 2006 00:03:43 -0700
Subject: [PATCH] --- yaml --- r: 33801 b: refs/heads/master c:
 471b40d0dfc17bf0161629950b82524d41bc37ce h: refs/heads/master i:   33799:
 4508c9934c6ad6c1ccfc0588a507e948497aec9a v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/power/Kconfig | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e7b5f6f578bd..3e58d543767d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96dd7421a06a5bc6eb731323b95efcb2fd864854
+refs/heads/master: 471b40d0dfc17bf0161629950b82524d41bc37ce
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
index ae44a70aae8a..619ecabf7c58 100644
--- a/trunk/kernel/power/Kconfig
+++ b/trunk/kernel/power/Kconfig
@@ -56,7 +56,7 @@ config PM_TRACE
 
 config SOFTWARE_SUSPEND
 	bool "Software Suspend"
-	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)
+	depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP) && !X86_PAE) || ((FRV || PPC32) && !SMP))
 	---help---
 	  Enable the possibility of suspending the machine.
 	  It doesn't need ACPI or APM.
@@ -78,6 +78,10 @@ config SOFTWARE_SUSPEND
 
 	  For more information take a look at <file:Documentation/power/swsusp.txt>.
 
+	  (For now, swsusp is incompatible with PAE aka HIGHMEM_64G on i386.
+	  we need identity mapping for resume to work, and that is trivial
+	  to get with 4MB pages, but less than trivial on PAE).
+
 config PM_STD_PARTITION
 	string "Default resume partition"
 	depends on SOFTWARE_SUSPEND