فهرست منبع

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>
Rafael J. Wysocki 17 سال پیش
والد
کامیت
c57591244a
4فایلهای تغییر یافته به همراه5 افزوده شده و 6 حذف شده
  1. 2 2
      arch/x86/power/Makefile
  2. 1 1
      arch/x86/power/cpu_32.c
  3. 1 1
      arch/x86/power/hibernate_32.c
  4. 1 2
      arch/x86/power/hibernate_asm_32.S

+ 2 - 2
arch/x86/power/Makefile

@@ -2,6 +2,6 @@ ifeq ($(CONFIG_X86_64),y)
         obj-$(CONFIG_PM)		+= suspend_64.o
         obj-$(CONFIG_PM)		+= suspend_64.o
         obj-$(CONFIG_HIBERNATION)	+= hibernate_asm_64.o
         obj-$(CONFIG_HIBERNATION)	+= hibernate_asm_64.o
 else
 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
 endif

+ 1 - 1
arch/x86/power/cpu.c → arch/x86/power/cpu_32.c

@@ -40,7 +40,7 @@ static void __save_processor_state(struct saved_context *ctxt)
  	savesegment(ss, ctxt->ss);
  	savesegment(ss, ctxt->ss);
 
 
 	/*
 	/*
-	 * control registers 
+	 * control registers
 	 */
 	 */
 	ctxt->cr0 = read_cr0();
 	ctxt->cr0 = read_cr0();
 	ctxt->cr2 = read_cr2();
 	ctxt->cr2 = read_cr2();

+ 1 - 1
arch/x86/power/suspend.c → 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
  * Distribute under GPLv2
  *
  *

+ 1 - 2
arch/x86/power/swsusp.S → arch/x86/power/hibernate_asm_32.S

@@ -1,7 +1,6 @@
 .text
 .text
 
 
-/* Originally gcc generated, modified by hand
- *
+/*
  * This may not use any stack, nor any variable that is not "NoSave":
  * 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"
  * Its rewriting one kernel image with another. What is stack in "old"