diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-06-10 01:27:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-06-12 21:32:33 +0200 |
| commit | 8b759b84c8b3c27ccc8dd787294636297b3ebb40 (patch) | |
| tree | c80ae791c342d242fb97434c26be2b63764da77a | |
| parent | a9d7052363a6e06bb623ed1876c56c7ca5b2c6d8 (diff) | |
| download | op-kernel-dev-8b759b84c8b3c27ccc8dd787294636297b3ebb40.zip op-kernel-dev-8b759b84c8b3c27ccc8dd787294636297b3ebb40.tar.gz | |
PM/Hibernate: Rename disk.c to hibernate.c
Change the name of kernel/power/disk.c to kernel/power/hibernate.c
in analogy with the file names introduced by the changes that
separated the suspend to RAM and standby funtionality from the
common PM functions.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
| -rw-r--r-- | kernel/power/Makefile | 2 | ||||
| -rw-r--r-- | kernel/power/hibernate.c (renamed from kernel/power/disk.c) | 4 | ||||
| -rw-r--r-- | kernel/power/power.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index c4baf1b..eadb17f 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -8,6 +8,6 @@ obj-$(CONFIG_PM_SLEEP) += console.o obj-$(CONFIG_FREEZER) += process.o obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o -obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o +obj-$(CONFIG_HIBERNATION) += swsusp.o hibernate.o snapshot.o swap.o user.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o diff --git a/kernel/power/disk.c b/kernel/power/hibernate.c index a9beba6..81d2e74 100644 --- a/kernel/power/disk.c +++ b/kernel/power/hibernate.c @@ -1,12 +1,12 @@ /* - * kernel/power/disk.c - Suspend-to-disk support. + * kernel/power/hibernate.c - Hibernation (a.k.a suspend-to-disk) support. * * Copyright (c) 2003 Patrick Mochel * Copyright (c) 2003 Open Source Development Lab * Copyright (c) 2004 Pavel Machek <pavel@suse.cz> + * Copyright (c) 2009 Rafael J. Wysocki, Novell Inc. * * This file is released under the GPLv2. - * */ #include <linux/suspend.h> diff --git a/kernel/power/power.h b/kernel/power/power.h index 2bd98d9..26d5a26 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -45,7 +45,7 @@ static inline char *check_image_kernel(struct swsusp_info *info) */ #define SPARE_PAGES ((1024 * 1024) >> PAGE_SHIFT) -/* kernel/power/disk.c */ +/* kernel/power/hibernate.c */ extern int hibernation_snapshot(int platform_mode); extern int hibernation_restore(int platform_mode); extern int hibernation_platform_enter(void); @@ -147,7 +147,7 @@ extern int swsusp_swap_in_use(void); */ #define SF_PLATFORM_MODE 1 -/* kernel/power/disk.c */ +/* kernel/power/hibernate.c */ extern int swsusp_check(void); extern void swsusp_free(void); extern int swsusp_read(unsigned int *flags_p); |
