remove CONFIG_PM_DISK
Subsystems (2)
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
Signed-off-by Coywolf Qi Hunt <[email protected]>
---
arch/i386/defconfig +0 -1
@@ -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
@@ -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
@@ -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.
Pavel Machek
AppliedHi!
Quoted 2 lines
Pmdisk was merged in a few months ago. This removes
CONFIG_PM_DISKfor 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!