x86 PM: move 64-bit hibernation files to arch/x86/power

Move arch/x86/kernel/suspend_64.c to arch/x86/power .

Move arch/x86/kernel/suspend_asm_64.S to arch/x86/power
as hibernate_asm_64.S .

Update purpose and copyright information in
arch/x86/power/suspend_64.c and
arch/x86/power/hibernate_asm_64.S .

Update the Makefiles in arch/x86, arch/x86/kernel and
arch/x86/power to reflect the above changes.

Signed-off-by: Rafael J. Wysocki <[e-mail]>
Acked-by: Pavel Machek <[e-mail]>
Signed-off-by: Ingo Molnar <[e-mail]>
Signed-off-by: Thomas Gleixner <[e-mail]>

arch/x86/Makefile

···
 # must be linked after kernel/
 drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/
 
-ifeq ($(CONFIG_X86_32),y)
+# suspend and hibernation support
 drivers-$(CONFIG_PM) += arch/x86/power/
+
+ifeq ($(CONFIG_X86_32),y)
 drivers-$(CONFIG_FB) += arch/x86/video/
 endif
 

arch/x86/kernel/Makefile

···
         obj-y				+= genapic_64.o genapic_flat_64.o
         obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
         obj-$(CONFIG_AUDIT)		+= audit_64.o
-        obj-$(CONFIG_PM)		+= suspend_64.o
-        obj-$(CONFIG_HIBERNATION)	+= suspend_asm_64.o
 
         obj-$(CONFIG_GART_IOMMU)	+= pci-gart_64.o aperture_64.o
         obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o

arch/x86/kernel/suspend_64.c arch/x86/power/suspend_64.c

···
 /*
- * Suspend support specific for i386.
+ * Suspend and hibernation support for x86-64
  *
  * Distribute under GPLv2
  *
+ * Copyright (c) 2007 Rafael J. Wysocki <[e-mail]>
  * Copyright (c) 2002 Pavel Machek <[e-mail]>
  * Copyright (c) 2001 Patrick Mochel <[e-mail]>
  */
···
 	mtrr_save_fixed_ranges(NULL);
 
 	/*
-	 * control registers 
+	 * control registers
 	 */
 	rdmsrl(MSR_EFER, ctxt->efer);
 	ctxt->cr0 = read_cr0();

arch/x86/kernel/suspend_asm_64.S arch/x86/power/hibernate_asm_64.S

···
-/* Copyright 2004,2005 Pavel Machek <[e-mail]>, Andi Kleen <[e-mail]>, Rafael J. Wysocki <[e-mail]>
+/*
+ * Hibernation support for x86-64
  *
  * Distribute under GPLv2.
+ *
+ * Copyright 2007 Rafael J. Wysocki <[e-mail]>
+ * Copyright 2005 Andi Kleen <[e-mail]>
+ * Copyright 2004 Pavel Machek <[e-mail]>
  *
  * swsusp_arch_resume must not use any stack or any nonlocal variables while
  * copying pages:
···
  * image could very well be data page in "new" image, and overwriting
  * your own stack under you is bad idea.
  */
-	
+
 	.text
 #include <linux/linkage.h>
 #include <asm/segment.h>

arch/x86/power/Makefile

···
-obj-$(CONFIG_PM)		+= cpu.o
-obj-$(CONFIG_HIBERNATION)	+= swsusp.o suspend.o
+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
+endif