---

yaml --- r: 65571 b: refs/heads/master c: e8d08eb h: refs/heads/master i: 65569: 1832760 65567: adc7975 v: v3
git-mirror · Oct 11, 2007 · a102de9 · a102de9
1 parent 0ae308d
commit a102de9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 987c75d7170686804b404b7f917b9e4b703702ff
+refs/heads/master: e8d08eb1b59bf6dda44fffe63cce1250d87a8b56
diff --git a/trunk/arch/x86/kernel/acpi/Makefile b/trunk/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/trunk/arch/x86/kernel/acpi/Makefile_64 b/trunk/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/trunk/arch/x86_64/kernel/acpi/sleep_64.c → trunk/arch/x86/kernel/acpi/sleep_64.c b/trunk/arch/x86_64/kernel/acpi/sleep_64.c → trunk/arch/x86/kernel/acpi/sleep_64.c
diff --git a/trunk/arch/x86_64/kernel/acpi/wakeup_64.S → trunk/arch/x86/kernel/acpi/wakeup_64.S b/trunk/arch/x86_64/kernel/acpi/wakeup_64.S → trunk/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/trunk/arch/x86_64/kernel/Makefile_64 b/trunk/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/trunk/arch/x86_64/kernel/acpi/Makefile b/trunk/arch/x86_64/kernel/acpi/Makefile
diff --git a/trunk/arch/x86_64/kernel/acpi/Makefile_64 b/trunk/arch/x86_64/kernel/acpi/Makefile_64