Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf7700fe authored Feb 09, 2008 by Rafael J. Wysocki Committed by Thomas Gleixner Feb 09, 2008

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 <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>

parent 9b706aee

arch/x86/Makefile

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -191,8 +191,10 @@ drivers-$(CONFIG_PCI) += arch/x86/pci/
	# must be linked after kernel/		# must be linked after kernel/
	drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/		drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/

	ifeq ($(CONFIG_X86_32),y)		# suspend and hibernation support
	drivers-$(CONFIG_PM) += arch/x86/power/		drivers-$(CONFIG_PM) += arch/x86/power/

			ifeq ($(CONFIG_X86_32),y)
	drivers-$(CONFIG_FB) += arch/x86/video/		drivers-$(CONFIG_FB) += arch/x86/video/
	endif		endif

arch/x86/kernel/Makefile

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -84,8 +84,6 @@ ifeq ($(CONFIG_X86_64),y)
	obj-y += genapic_64.o genapic_flat_64.o		obj-y += genapic_64.o genapic_flat_64.o
	obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o		obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o
	obj-$(CONFIG_AUDIT) += audit_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_GART_IOMMU) += pci-gart_64.o aperture_64.o
	obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o		obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o

arch/x86/power/Makefile

+7 −2

Original line number	Original line	Diff line number	Diff line
			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_PM) += cpu.o
	obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o		obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o
			endif

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

+7 −2

Original line number	Original line	Diff line number	Diff line
	/* Copyright 2004,2005 Pavel Machek <pavel@suse.cz>, Andi Kleen <ak@suse.de>, Rafael J. Wysocki <rjw@sisk.pl>		/*
			* Hibernation support for x86-64
	*		*
	* Distribute under GPLv2.		* Distribute under GPLv2.
	*		*
			* Copyright 2007 Rafael J. Wysocki <rjw@sisk.pl>
			* Copyright 2005 Andi Kleen <ak@suse.de>
			* Copyright 2004 Pavel Machek <pavel@suse.cz>
			*
	* swsusp_arch_resume must not use any stack or any nonlocal variables while		* swsusp_arch_resume must not use any stack or any nonlocal variables while
	* copying pages:		* copying pages:
	*		*

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Suspend support specific for i386.		* Suspend and hibernation support for x86-64
	*		*
	* Distribute under GPLv2		* Distribute under GPLv2
	*		*
			* Copyright (c) 2007 Rafael J. Wysocki <rjw@sisk.pl>
	* Copyright (c) 2002 Pavel Machek <pavel@suse.cz>		* Copyright (c) 2002 Pavel Machek <pavel@suse.cz>
	* Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>		* Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>
	*/		*/