diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-02-09 23:24:09 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-02-09 23:24:09 +0100 |
| commit | c57591244a08bb441c83472f5c110151bb7c2cc6 (patch) | |
| tree | adfb539d83e67079e8bb26085b12f9d33f0120ee | |
| parent | cf7700fe24301df2c8d3636cf40784651c098207 (diff) | |
x86 PM: rename 32-bit files in arch/x86/power
Rename cpu.c, suspend.c and swsusp.S in arch/x86/power to cpu_32.c,
hibernate_32.c and hibernate_asm_32.S, respectively, and update the
purpose and copyright information in these files.
Update the Makefile in arch/x86/power to reflect the above changes.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/power/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86/power/cpu_32.c (renamed from arch/x86/power/cpu.c) | 2 | ||||
| -rw-r--r-- | arch/x86/power/hibernate_32.c (renamed from arch/x86/power/suspend.c) | 2 | ||||
| -rw-r--r-- | arch/x86/power/hibernate_asm_32.S (renamed from arch/x86/power/swsusp.S) | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile index 8ce87fb4abb..2c95118e510 100644 --- a/arch/x86/power/Makefile +++ b/arch/x86/power/Makefile @@ -2,6 +2,6 @@ ifeq ($(CONFIG_X86_64),y) obj-$(CONFIG_PM) += suspend_64.o obj-$(CONFIG_HIBERNATION) += hibernate_asm_64.o else - obj-$(CONFIG_PM) += cpu.o - obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o + obj-$(CONFIG_PM) += cpu_32.o + obj-$(CONFIG_HIBERNATION) += hibernate_32.o hibernate_asm_32.o endif diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu_32.c index efcf620d143..7f9c6da04a4 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu_32.c @@ -40,7 +40,7 @@ static void __save_processor_state(struct saved_context *ctxt) savesegment(ss, ctxt->ss); /* - * control registers + * control registers */ ctxt->cr0 = read_cr0(); ctxt->cr2 = read_cr2(); diff --git a/arch/x86/power/suspend.c b/arch/x86/power/hibernate_32.c index a0020b913f3..5080c377ef1 100644 --- a/arch/x86/power/suspend.c +++ b/arch/x86/power/hibernate_32.c @@ -1,5 +1,5 @@ /* - * Suspend support specific for i386 - temporary page tables + * Hibernation support specific for i386 - temporary page tables * * Distribute under GPLv2 * diff --git a/arch/x86/power/swsusp.S b/arch/x86/power/hibernate_asm_32.S index 53662e05b39..b95aa6cfe3c 100644 --- a/arch/x86/power/swsusp.S +++ b/arch/x86/power/hibernate_asm_32.S @@ -1,7 +1,6 @@ .text -/* Originally gcc generated, modified by hand - * +/* * This may not use any stack, nor any variable that is not "NoSave": * * Its rewriting one kernel image with another. What is stack in "old" |