From e8d08eb1b59bf6dda44fffe63cce1250d87a8b56 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:17:05 +0200
Subject: [PATCH] x86_64: move kernel/acpi
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/acpi/Makefile | 2 +-
arch/x86/kernel/acpi/Makefile_64 | 7 +++++++
arch/{x86_64 => x86}/kernel/acpi/sleep_64.c | 0
arch/{x86_64 => x86}/kernel/acpi/wakeup_64.S | 2 +-
arch/x86_64/kernel/Makefile_64 | 2 +-
arch/x86_64/kernel/acpi/Makefile | 5 -----
arch/x86_64/kernel/acpi/Makefile_64 | 9 ---------
7 files changed, 10 insertions(+), 17 deletions(-)
create mode 100644 arch/x86/kernel/acpi/Makefile_64
rename arch/{x86_64 => x86}/kernel/acpi/sleep_64.c (100%)
rename arch/{x86_64 => x86}/kernel/acpi/wakeup_64.S (99%)
delete mode 100644 arch/x86_64/kernel/acpi/Makefile
delete mode 100644 arch/x86_64/kernel/acpi/Makefile_64
diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile
index dd4eb7cef2b4c..3d5671939542a 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 0000000000000..629425bc002d3
--- /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
similarity index 100%
rename from arch/x86_64/kernel/acpi/sleep_64.c
rename to 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
similarity index 99%
rename from arch/x86_64/kernel/acpi/wakeup_64.S
rename to arch/x86/kernel/acpi/wakeup_64.S
index 8b4357e1efe0b..5e3b3f5496c5f 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 3a204cc599d74..120d4e51fd4d1 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 dd4eb7cef2b4c..0000000000000
--- 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 fc377c87e0b07..0000000000000
--- 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
-
--
GitLab