Skip to contentSkip to conversation

remove CONFIG_PM_DISK

PATCH Applied Coywolf Qi Hunt 2 participants 2 messages Mar 25, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove CONFIG_PM_DISK

Hello,

Pmdisk was merged in a few months ago. This removes CONFIG_PM_DISK for conditional compilation.

Coywolf

---

arch/i386/defconfig +0 -1
diff -pruN 2.6.11-mm4/arch/i386/defconfig 2.6.11-mm4-cy/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
arch/i386/mm/init.c +1 -1
diff -pruN 2.6.11-mm4/arch/i386/mm/init.c 2.6.11-mm4-cy/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.
mm/page_io.c +1 -1
diff -pruN 2.6.11-mm4/mm/page_io.c 2.6.11-mm4-cy/mm/page_io.c
@@ -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.
Applied
#1 lore raw

Hi!

Quoted 2 lines

Pmdisk was merged in a few months ago. This removes CONFIG_PM_DISK for conditional compilation.

Thanks, applied to my tree.
Pavel

Signature · 2 lines
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!