asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86_64: move kernel/acpi

Browse source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2007-10-11 11:17:05 +02:00
parent 987c75d717
commit e8d08eb1b5
7 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/kernel/acpi/Makefile
View file

@ -1,5 +1,5 @@
ifeq ($(CONFIG_X86_32),y)
include ${srctree}/arch/x86/kernel/acpi/Makefile_32
else
include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64
include ${srctree}/arch/x86/kernel/acpi/Makefile_64
endif

7
arch/x86/kernel/acpi/Makefile_64 Normal file
View file

@ -0,0 +1,7 @@
obj-y := boot.o
obj-$(CONFIG_ACPI_SLEEP) += sleep_64.o wakeup_64.o
ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += processor.o cstate.o
endif

0
arch/x86_64/kernel/acpi/sleep_64.c → arch/x86/kernel/acpi/sleep_64.c
View file

2
arch/x86_64/kernel/acpi/wakeup_64.S → arch/x86/kernel/acpi/wakeup_64.S
View file

@ -269,7 +269,7 @@ no_longmode:
movb $0xbc,%al ; outb %al,$0x80
jmp no_longmode
#include "../verify_cpu_64.S"
#include "../../../x86_64/kernel/verify_cpu_64.S"
/* This code uses an extended set of video mode numbers. These include:
* Aliases for standard modes

2
arch/x86_64/kernel/Makefile_64
View file

@ -16,7 +16,7 @@ obj-$(CONFIG_X86_MCE) += mce_64.o therm_throt.o
obj-$(CONFIG_X86_MCE_INTEL) += mce_intel_64.o
obj-$(CONFIG_X86_MCE_AMD) += mce_amd_64.o
obj-$(CONFIG_MTRR) += ../../x86/kernel/cpu/mtrr/
obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_ACPI) += ../../x86/kernel/acpi/
obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_X86_CPUID) += cpuid.o

5
arch/x86_64/kernel/acpi/Makefile
View file

@ -1,5 +0,0 @@
ifeq ($(CONFIG_X86_32),y)
include ${srctree}/arch/x86/kernel/acpi/Makefile_32
else
include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64
endif

9
arch/x86_64/kernel/acpi/Makefile_64
View file

@ -1,9 +0,0 @@
obj-y := boot.o
boot-y := ../../../x86/kernel/acpi/boot.o
obj-$(CONFIG_ACPI_SLEEP) += sleep_64.o wakeup_64.o
ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += processor.o
processor-y := ../../../x86/kernel/acpi/processor.o ../../../x86/kernel/acpi/cstate.o
endif