Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 648be318 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] swsusp: kill config_pm_disk 



CONFIG_PM_DISK is long gone, but it still managed to survived at few
places.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fc5fb2c6

arch/i386/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int swap_readpage(struct file *file, struct page *page) 
	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.