diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:17:05 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:17:05 +0200 |
| commit | e8d08eb1b59bf6dda44fffe63cce1250d87a8b56 (patch) | |
| tree | f73f6b2b8ee0d2c6b06427fdd55f9d29212ca6bc /arch | |
| parent | 987c75d7170686804b404b7f917b9e4b703702ff (diff) | |
x86_64: move kernel/acpi
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/acpi/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/Makefile_64 | 7 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/sleep_64.c (renamed from arch/x86_64/kernel/acpi/sleep_64.c) | 0 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_64.S (renamed from arch/x86_64/kernel/acpi/wakeup_64.S) | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/Makefile_64 | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/acpi/Makefile | 5 | ||||
| -rw-r--r-- | arch/x86_64/kernel/acpi/Makefile_64 | 9 |
7 files changed, 10 insertions, 17 deletions
diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile index dd4eb7cef2b..3d567193954 100644 --- a/arch/x86/kernel/acpi/Makefile +++ b/arch/x86/kernel/acpi/Makefile @@ -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 diff --git a/arch/x86/kernel/acpi/Makefile_64 b/arch/x86/kernel/acpi/Makefile_64 new file mode 100644 index 00000000000..629425bc002 --- /dev/null +++ b/arch/x86/kernel/acpi/Makefile_64 @@ -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 + diff --git a/arch/x86_64/kernel/acpi/sleep_64.c b/arch/x86/kernel/acpi/sleep_64.c index 79475d23707..79475d23707 100644 --- a/arch/x86_64/kernel/acpi/sleep_64.c +++ b/arch/x86/kernel/acpi/sleep_64.c diff --git a/arch/x86_64/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index 8b4357e1efe..5e3b3f5496c 100644 --- a/arch/x86_64/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -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 diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86_64/kernel/Makefile_64 index 3a204cc599d..120d4e51fd4 100644 --- a/arch/x86_64/kernel/Makefile_64 +++ b/arch/x86_64/kernel/Makefile_64 @@ -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 diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile deleted file mode 100644 index dd4eb7cef2b..00000000000 --- a/arch/x86_64/kernel/acpi/Makefile +++ /dev/null @@ -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 diff --git a/arch/x86_64/kernel/acpi/Makefile_64 b/arch/x86_64/kernel/acpi/Makefile_64 deleted file mode 100644 index fc377c87e0b..00000000000 --- a/arch/x86_64/kernel/acpi/Makefile_64 +++ /dev/null @@ -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 - |