From 23d6f82bd1f07886b3a974c5193baa715475dd37 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:16:23 +0200 Subject: [PATCH] i386: move kernel/acpi Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/i386/kernel/Makefile_32 | 2 +- arch/{i386 => x86}/kernel/acpi/Makefile | 2 +- arch/{i386 => x86}/kernel/acpi/Makefile_32 | 0 arch/{i386 => x86}/kernel/acpi/boot.c | 0 arch/{i386 => x86}/kernel/acpi/cstate.c | 0 arch/{i386 => x86}/kernel/acpi/earlyquirk_32.c | 0 arch/{i386 => x86}/kernel/acpi/processor.c | 0 arch/{i386 => x86}/kernel/acpi/sleep_32.c | 0 arch/{i386 => x86}/kernel/acpi/wakeup_32.S | 0 arch/x86_64/kernel/acpi/Makefile | 2 +- arch/x86_64/kernel/acpi/Makefile_64 | 4 ++-- 11 files changed, 5 insertions(+), 5 deletions(-) rename arch/{i386 => x86}/kernel/acpi/Makefile (63%) rename arch/{i386 => x86}/kernel/acpi/Makefile_32 (100%) rename arch/{i386 => x86}/kernel/acpi/boot.c (100%) rename arch/{i386 => x86}/kernel/acpi/cstate.c (100%) rename arch/{i386 => x86}/kernel/acpi/earlyquirk_32.c (100%) rename arch/{i386 => x86}/kernel/acpi/processor.c (100%) rename arch/{i386 => x86}/kernel/acpi/sleep_32.c (100%) rename arch/{i386 => x86}/kernel/acpi/wakeup_32.S (100%) diff --git a/arch/i386/kernel/Makefile_32 b/arch/i386/kernel/Makefile_32 index d9dd3d677b72..af8304b921de 100644 --- a/arch/i386/kernel/Makefile_32 +++ b/arch/i386/kernel/Makefile_32 @@ -11,7 +11,7 @@ obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += cpu/ -obj-y += acpi/ +obj-y += ../../x86/kernel/acpi/ obj-$(CONFIG_X86_BIOS_REBOOT) += reboot_32.o obj-$(CONFIG_MCA) += mca_32.o obj-$(CONFIG_X86_MSR) += msr.o diff --git a/arch/i386/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile similarity index 63% rename from arch/i386/kernel/acpi/Makefile rename to arch/x86/kernel/acpi/Makefile index 6e00bfeb59a9..dd4eb7cef2b4 100644 --- a/arch/i386/kernel/acpi/Makefile +++ b/arch/x86/kernel/acpi/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/i386/kernel/acpi/Makefile_32 +include ${srctree}/arch/x86/kernel/acpi/Makefile_32 else include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64 endif diff --git a/arch/i386/kernel/acpi/Makefile_32 b/arch/x86/kernel/acpi/Makefile_32 similarity index 100% rename from arch/i386/kernel/acpi/Makefile_32 rename to arch/x86/kernel/acpi/Makefile_32 diff --git a/arch/i386/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c similarity index 100% rename from arch/i386/kernel/acpi/boot.c rename to arch/x86/kernel/acpi/boot.c diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c similarity index 100% rename from arch/i386/kernel/acpi/cstate.c rename to arch/x86/kernel/acpi/cstate.c diff --git a/arch/i386/kernel/acpi/earlyquirk_32.c b/arch/x86/kernel/acpi/earlyquirk_32.c similarity index 100% rename from arch/i386/kernel/acpi/earlyquirk_32.c rename to arch/x86/kernel/acpi/earlyquirk_32.c diff --git a/arch/i386/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c similarity index 100% rename from arch/i386/kernel/acpi/processor.c rename to arch/x86/kernel/acpi/processor.c diff --git a/arch/i386/kernel/acpi/sleep_32.c b/arch/x86/kernel/acpi/sleep_32.c similarity index 100% rename from arch/i386/kernel/acpi/sleep_32.c rename to arch/x86/kernel/acpi/sleep_32.c diff --git a/arch/i386/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S similarity index 100% rename from arch/i386/kernel/acpi/wakeup_32.S rename to arch/x86/kernel/acpi/wakeup_32.S diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile index 6e00bfeb59a9..dd4eb7cef2b4 100644 --- a/arch/x86_64/kernel/acpi/Makefile +++ b/arch/x86_64/kernel/acpi/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/i386/kernel/acpi/Makefile_32 +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 index c24fe95b0d94..fc377c87e0b0 100644 --- a/arch/x86_64/kernel/acpi/Makefile_64 +++ b/arch/x86_64/kernel/acpi/Makefile_64 @@ -1,9 +1,9 @@ obj-y := boot.o -boot-y := ../../../i386/kernel/acpi/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 := ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o +processor-y := ../../../x86/kernel/acpi/processor.o ../../../x86/kernel/acpi/cstate.o endif