Commit e8d08eb1 authored by Thomas Gleixner's avatar Thomas Gleixner

x86_64: move kernel/acpi

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 987c75d7
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
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
obj-y += processor.o cstate.o
endif
......@@ -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
......
......@@ -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
......
ifeq ($(CONFIG_X86_32),y)
include ${srctree}/arch/x86/kernel/acpi/Makefile_32
else
include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64
endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment