Hello,
Pmdisk was merged in a few months ago. This removes CONFIG_PM_DISK
for conditional compilation.
Coywolf
Signed-off-by: Coywolf Qi Hunt <[email protected]>
---
diff -pruN 2.6.11-mm4/arch/i386/defconfig 2.6.11-mm4-cy/arch/i386/defconfig
--- 2.6.11-mm4/arch/i386/defconfig 2005-03-17 01:21:16.000000000 +0800
+++ 2.6.11-mm4-cy/arch/i386/defconfig 2005-03-20 02:24:48.000000000 +0800
@@ -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 -pruN 2.6.11-mm4/arch/i386/mm/init.c 2.6.11-mm4-cy/arch/i386/mm/init.c
--- 2.6.11-mm4/arch/i386/mm/init.c 2005-03-17 01:21:17.000000000 +0800
+++ 2.6.11-mm4-cy/arch/i386/mm/init.c 2005-03-20 02:41:26.000000000 +0800
@@ -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 -pruN 2.6.11-mm4/mm/page_io.c 2.6.11-mm4-cy/mm/page_io.c
--- 2.6.11-mm4/mm/page_io.c 2004-08-20 14:20:15.000000000 +0800
+++ 2.6.11-mm4-cy/mm/page_io.c 2005-03-20 02:36:54.000000000 +0800
@@ -127,7 +127,7 @@ out:
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.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
