From c57591244a08bb441c83472f5c110151bb7c2cc6 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sat, 9 Feb 2008 23:24:09 +0100 Subject: [PATCH] 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 Acked-by: Pavel Machek Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- arch/x86/power/Makefile | 4 ++-- arch/x86/power/{cpu.c => cpu_32.c} | 2 +- arch/x86/power/{suspend.c => hibernate_32.c} | 2 +- arch/x86/power/{swsusp.S => hibernate_asm_32.S} | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) rename arch/x86/power/{cpu.c => cpu_32.c} (99%) rename arch/x86/power/{suspend.c => hibernate_32.c} (98%) rename arch/x86/power/{swsusp.S => hibernate_asm_32.S} (96%) diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile index 8ce87fb4ab..2c95118e51 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 similarity index 99% rename from arch/x86/power/cpu.c rename to arch/x86/power/cpu_32.c index efcf620d14..7f9c6da04a 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 similarity index 98% rename from arch/x86/power/suspend.c rename to arch/x86/power/hibernate_32.c index a0020b913f..5080c377ef 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 similarity index 96% rename from arch/x86/power/swsusp.S rename to arch/x86/power/hibernate_asm_32.S index 53662e05b3..b95aa6cfe3 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" -- 2.39.5