public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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 19/20] hugetlbpage.c switch
Date: Thu, 15 Mar 2007 01:13:56 -0400	[thread overview]
Message-ID: <20070315051532.935868806@goodmis.org> (raw)
In-Reply-To: 20070315051337.488091591@goodmis.org

[-- Attachment #1: 20-hugetlbpage.patch --]
[-- Type: text/plain, Size: 2145 bytes --]

Move the hugetlbpage.c to the common area.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index d73a830..06dd07e 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -102,6 +102,7 @@ libs-y 					+= arch/i386/lib/
 core-y					+= arch/i386/kernel/ \
 					   arch/x86/kernel/ \
 					   arch/i386/mm/ \
+					   arch/x86/mm/ \
 					   arch/i386/$(mcore-y)/ \
 					   arch/i386/crypto/
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/i386/math-emu/
diff --git a/arch/i386/mm/Makefile b/arch/i386/mm/Makefile
index 80908b5..0cb01e6 100644
--- a/arch/i386/mm/Makefile
+++ b/arch/i386/mm/Makefile
@@ -5,6 +5,5 @@
 obj-y	:= init.o pgtable.o fault.o ioremap.o extable.o pageattr.o mmap.o
 
 obj-$(CONFIG_NUMA) += discontig.o
-obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_HIGHMEM) += highmem.o
 obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap.o
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
new file mode 100644
index 0000000..1b6e922
--- /dev/null
+++ b/arch/x86/mm/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
diff --git a/arch/i386/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
similarity index 100%
rename from arch/i386/mm/hugetlbpage.c
rename to arch/x86/mm/hugetlbpage.c
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 3cf9198..abf1829 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -81,6 +81,7 @@ libs-y 					+= arch/x86_64/lib/
 core-y					+= arch/x86_64/kernel/ \
 					   arch/x86/kernel/ \
 					   arch/x86_64/mm/ \
+					   arch/x86/mm/ \
 					   arch/x86_64/crypto/
 core-$(CONFIG_IA32_EMULATION)		+= arch/x86_64/ia32/
 drivers-$(CONFIG_PCI)			+= arch/x86_64/pci/
diff --git a/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile
index d25ac86..b6f1f43 100644
--- a/arch/x86_64/mm/Makefile
+++ b/arch/x86_64/mm/Makefile
@@ -3,9 +3,7 @@
 #
 
 obj-y	 := init.o fault.o ioremap.o extable.o pageattr.o mmap.o
-obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_NUMA) += numa.o
 obj-$(CONFIG_K8_NUMA) += k8topology.o
 obj-$(CONFIG_ACPI_NUMA) += srat.o
 
-hugetlbpage-y = ../../i386/mm/hugetlbpage.o

--

  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 ` [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 ` Steven Rostedt [this message]
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.935868806@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