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 01/20] early_printk.c switch
Date: Thu, 15 Mar 2007 01:13:38 -0400 [thread overview]
Message-ID: <20070315051529.277974230@goodmis.org> (raw)
In-Reply-To: 20070315051337.488091591@goodmis.org
[-- Attachment #1: 00-early_printk.patch-update --]
[-- Type: text/plain, Size: 2577 bytes --]
Move the early_printk.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 4ae3dcf..a57040d 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -35,7 +35,6 @@ obj-$(CONFIG_ACPI_SRAT) += srat.o
obj-$(CONFIG_EFI) += efi.o efi_stub.o
obj-$(CONFIG_DOUBLEFAULT) += doublefault.o
obj-$(CONFIG_VM86) += vm86.o
-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_HPET_TIMER) += hpet.o
obj-$(CONFIG_K8_NB) += k8.o
diff --git a/arch/i386/kernel/early_printk.c b/arch/i386/kernel/early_printk.c
deleted file mode 100644
index 92f812b..0000000
--- a/arch/i386/kernel/early_printk.c
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "../../x86_64/kernel/early_printk.c"
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
new file mode 100644
index 0000000..55f268f
--- /dev/null
+++ b/arch/x86/kernel/Makefile
@@ -0,0 +1,2 @@
+
+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
similarity index 100%
rename from arch/x86_64/kernel/early_printk.c
rename to arch/x86/kernel/early_printk.c
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 2941a91..3cf9198 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -79,6 +79,7 @@ head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kern
libs-y += arch/x86_64/lib/
core-y += arch/x86_64/kernel/ \
+ arch/x86/kernel/ \
arch/x86_64/mm/ \
arch/x86_64/crypto/
core-$(CONFIG_IA32_EMULATION) += arch/x86_64/ia32/
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index bb47e86..8b2535c 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -28,7 +28,6 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
obj-$(CONFIG_PM) += suspend.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o
obj-$(CONFIG_CPU_FREQ) += cpufreq/
-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o
obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary.o tce.o
obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index bd28f9f..d73a830 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -100,6 +100,7 @@ head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
libs-y += arch/i386/lib/
core-y += arch/i386/kernel/ \
+ arch/x86/kernel/ \
arch/i386/mm/ \
arch/i386/$(mcore-y)/ \
arch/i386/crypto/
--
next prev parent reply other threads:[~2007-03-15 5:17 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 ` Steven Rostedt [this message]
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 ` [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=20070315051529.277974230@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