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 09/20] cpuid.c switch
Date: Thu, 15 Mar 2007 01:13:46 -0400 [thread overview]
Message-ID: <20070315051530.840797199@goodmis.org> (raw)
In-Reply-To: 20070315051337.488091591@goodmis.org
[-- Attachment #1: 10-cpuid.patch --]
[-- Type: text/plain, Size: 2041 bytes --]
Move the cpuid.c to the common area.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 5276349..4437181 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -14,7 +14,6 @@ obj-y += cpu/
obj-y += acpi/
obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o
obj-$(CONFIG_MCA) += mca.o
-obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_APM) += apm.o
obj-$(CONFIG_X86_SMP) += smp.o smpboot.o
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 4e5a88f..912421a 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-$(CONFIG_X86_MSR) += msr.o
+obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
# i386 defines CONFIG_X86_SMP when CONFIG_SMP and !CONFIG_X86_VOYAGER
diff --git a/arch/i386/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
similarity index 100%
rename from arch/i386/kernel/cpuid.c
rename to arch/x86/kernel/cpuid.c
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 248dbe8..f5997f3 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -17,7 +17,6 @@ obj-$(CONFIG_X86_MCE_AMD) += mce_amd.o
obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/
obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_MICROCODE) += microcode.o
-obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o
obj-y += apic.o nmi.o
obj-y += io_apic.o mpparse.o \
@@ -45,7 +44,6 @@ obj-y += pcspeaker.o
CFLAGS_vsyscall.o := $(PROFILING) -g0
therm_throt-y += ../../i386/kernel/cpu/mcheck/therm_throt.o
-cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o
microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o
intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o
pcspeaker-y += ../../i386/kernel/pcspeaker.o
--
next prev parent reply other threads:[~2007-03-15 5:20 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 ` Steven Rostedt [this message]
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 ` [PATCH take3 16/20] acpi " Steven Rostedt
2007-03-15 6:36 ` 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=20070315051530.840797199@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.