From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>, Chris Wright <chrisw@sous-sol.org>,
Rusty Russell <rusty@rustcorp.com.au>, Andi Kleen <ak@muc.de>,
Glauber de Oliveira Costa <glommer@gmail.com>,
Jeremy Fitzhardinge <jeremy@goop.org>
Subject: [PATCH take3 16/20] acpi files switched
Date: Thu, 15 Mar 2007 01:13:53 -0400 [thread overview]
Message-ID: <20070315051532.400874263@goodmis.org> (raw)
In-Reply-To: 20070315051337.488091591@goodmis.org
[-- Attachment #1: 17-acpi.patch --]
[-- Type: text/plain, Size: 2338 bytes --]
Moved the shared files that were in arch/i386/kernel/acpi to the common
area.
Note, there still exists files in both archs in acpi. Since there's code
there that is unique to the arch.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile
index 7f7be01..3de22c2 100644
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
@@ -1,10 +1,5 @@
-obj-$(CONFIG_ACPI) += boot.o
ifneq ($(CONFIG_PCI),)
obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
endif
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
-ifneq ($(CONFIG_ACPI_PROCESSOR),)
-obj-y += cstate.o processor.o
-endif
-
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index c1a2b58..1167962 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -1,6 +1,7 @@
obj-y += bootflag.o quirks.o i8237.o topology.o alternative.o
obj-y += cpu/
+obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_X86_CPUID) += cpuid.o
diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile
new file mode 100644
index 0000000..3aa3d16
--- /dev/null
+++ b/arch/x86/kernel/acpi/Makefile
@@ -0,0 +1,5 @@
+obj-y += boot.o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y += processor.o cstate.o
+endif
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/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/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile
index 080b996..eb4bc11 100644
--- a/arch/x86_64/kernel/acpi/Makefile
+++ b/arch/x86_64/kernel/acpi/Makefile
@@ -1,9 +1,2 @@
-obj-y := boot.o
-boot-y := ../../../i386/kernel/acpi/boot.o
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
-ifneq ($(CONFIG_ACPI_PROCESSOR),)
-obj-y += processor.o
-processor-y := ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o
-endif
-
--
next prev parent reply other threads:[~2007-03-15 5:18 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-15 5:13 [PATCH take3 00/20] Make common x86 arch area for i386 and x86_64 - Take 3 Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 01/20] early_printk.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 02/20] tsc_sync.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 03/20] bootflag.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 04/20] quirks.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 05/20] i8237.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 06/20] topology.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 07/20] alternative.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 08/20] msr.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 09/20] cpuid.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 10/20] microcode.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 11/20] pcspeaker.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 12/20] mtrr directory switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 13/20] therm_throt.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 14/20] intel_cacheinfo.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 15/20] cpufreq files switched Steven Rostedt
2007-03-15 5:13 ` Steven Rostedt [this message]
2007-03-15 6:36 ` [PATCH take3 16/20] acpi " Len Brown
2007-03-15 7:33 ` Chris Wright
2007-03-15 11:51 ` Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 17/20] k8.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 18/20] stacktrace.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 19/20] hugetlbpage.c switch Steven Rostedt
2007-03-15 5:13 ` [PATCH take3 20/20] oprofile files switched Steven Rostedt
2007-03-15 6:37 ` [PATCH take3 00/20] Make common x86 arch area for i386 and x86_64 - Take 3 Rusty Russell
2007-03-16 10:13 ` Ingo Molnar
2007-03-16 10:29 ` Ingo Molnar
2007-03-19 1:06 ` Chuck Ebbert
2007-03-19 12:17 ` William Lee Irwin III
2007-03-19 13:10 ` Chuck Ebbert
2007-03-19 14:23 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070315051532.400874263@goodmis.org \
--to=rostedt@goodmis.org \
--cc=ak@muc.de \
--cc=akpm@linux-foundation.org \
--cc=chrisw@sous-sol.org \
--cc=glommer@gmail.com \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox