diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-02-09 17:24:09 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-02-09 17:24:09 -0500 |
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 8ce87fb4abb4..2c95118e510a 100644 --- a/arch/x86/power/Makefile +++ b/arch/x86/power/Makefile | |||
@@ -2,6 +2,6 @@ ifeq ($(CONFIG_X86_64),y) | |||
2 | obj-$(CONFIG_PM) += suspend_64.o | 2 | obj-$(CONFIG_PM) += suspend_64.o |
3 | obj-$(CONFIG_HIBERNATION) += hibernate_asm_64.o | 3 | obj-$(CONFIG_HIBERNATION) += hibernate_asm_64.o |
4 | else | 4 | else |
5 | obj-$(CONFIG_PM) += cpu.o | 5 | obj-$(CONFIG_PM) += cpu_32.o |
6 | obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o | 6 | obj-$(CONFIG_HIBERNATION) += hibernate_32.o hibernate_asm_32.o |
7 | endif | 7 | endif |
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu_32.c index efcf620d1439..7f9c6da04a4c 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) | |||
40 | savesegment(ss, ctxt->ss); | 40 | savesegment(ss, ctxt->ss); |
41 | 41 | ||
42 | /* | 42 | /* |
43 | * control registers | 43 | * control registers |
44 | */ | 44 | */ |
45 | ctxt->cr0 = read_cr0(); | 45 | ctxt->cr0 = read_cr0(); |
46 | ctxt->cr2 = read_cr2(); | 46 | ctxt->cr2 = read_cr2(); |
diff --git a/arch/x86/power/suspend.c b/arch/x86/power/hibernate_32.c index a0020b913f31..5080c377ef12 100644 --- a/arch/x86/power/suspend.c +++ b/arch/x86/power/hibernate_32.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Suspend support specific for i386 - temporary page tables | 2 | * Hibernation support specific for i386 - temporary page tables |
3 | * | 3 | * |
4 | * Distribute under GPLv2 | 4 | * Distribute under GPLv2 |
5 | * | 5 | * |
diff --git a/arch/x86/power/swsusp.S b/arch/x86/power/hibernate_asm_32.S index 53662e05b393..b95aa6cfe3cb 100644 --- a/arch/x86/power/swsusp.S +++ b/arch/x86/power/hibernate_asm_32.S | |||
@@ -1,7 +1,6 @@ | |||
1 | .text | 1 | .text |
2 | 2 | ||
3 | /* Originally gcc generated, modified by hand | 3 | /* |
4 | * | ||
5 | * This may not use any stack, nor any variable that is not "NoSave": | 4 | * This may not use any stack, nor any variable that is not "NoSave": |
6 | * | 5 | * |
7 | * Its rewriting one kernel image with another. What is stack in "old" | 6 | * Its rewriting one kernel image with another. What is stack in "old" |