Commit:     a6eb84bc1e069e1d285167e09035ed6c27978feb
Parent:     ffffa4b502099a03b5215b814fdcd79fb4348854
Author:     Rafael J. Wysocki <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 1 15:28:16 2008 +0100
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 18:30:59 2008 -0500

    suspend: cleanup reference to swsusp_pg_dir[]
    swsusp_pg_dir[] is used for suspend, but not for hibernation.
    clean-up the ifdefs which worked by accident, while implying the opposite.
    Delete the __nosavedata, which also implied the opposite.
    Some day we may optimize CONFIG_ACPI_SLEEP to build minimal kernels
    for just hibernate or just suspend but not both,
    but today isn't that day.
    Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
 arch/x86/mm/init_32.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index da524fb..f2f36f8 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -423,23 +423,23 @@ static void __init pagetable_init(void)
-#if defined(CONFIG_HIBERNATION) || defined(CONFIG_ACPI)
- * Swap suspend & friends need this for resume because things like the 
+ * ACPI suspend needs this for resume, because things like the intel-agp
  * driver might have split up a kernel 4MB mapping.
-char __nosavedata swsusp_pg_dir[PAGE_SIZE]
+char swsusp_pg_dir[PAGE_SIZE]
        __attribute__ ((aligned(PAGE_SIZE)));
 static inline void save_pg_dir(void)
        memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE);
+#else /* !CONFIG_ACPI_SLEEP */
 static inline void save_pg_dir(void)
+#endif /* !CONFIG_ACPI_SLEEP */
 void zap_low_mappings(void)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to