提交 648be318 编写于 作者: P Pavel Machek 提交者: Linus Torvalds

[PATCH] swsusp: kill config_pm_disk

CONFIG_PM_DISK is long gone, but it still managed to survived at few
places.
Signed-off-by: NPavel Machek <pavel@suse.cz>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 fc5fb2c6
...@@ -126,7 +126,6 @@ CONFIG_HAVE_DEC_LOCK=y ...@@ -126,7 +126,6 @@ CONFIG_HAVE_DEC_LOCK=y
# #
CONFIG_PM=y CONFIG_PM=y
CONFIG_SOFTWARE_SUSPEND=y CONFIG_SOFTWARE_SUSPEND=y
# CONFIG_PM_DISK is not set
# #
# ACPI (Advanced Configuration and Power Interface) Support # ACPI (Advanced Configuration and Power Interface) Support
......
...@@ -352,7 +352,7 @@ static void __init pagetable_init (void) ...@@ -352,7 +352,7 @@ static void __init pagetable_init (void)
#endif #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 * Swap suspend & friends need this for resume because things like the intel-agp
* driver might have split up a kernel 4MB mapping. * driver might have split up a kernel 4MB mapping.
......
...@@ -127,7 +127,7 @@ int swap_readpage(struct file *file, struct page *page) ...@@ -127,7 +127,7 @@ int swap_readpage(struct file *file, struct page *page)
return ret; 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 * 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. * and wait on the I/O. The caller must have a ref on the page.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册