---

yaml --- r: 123332 b: refs/heads/master c: 27137e5 h: refs/heads/master v: v3
git-mirror · Dec 4, 2008 · d9e9250 · d9e9250
1 parent 82874e7
commit d9e9250
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c37ddd936d96b46cf2bb17e7b1a18b2bd24ec1fb
+refs/heads/master: 27137e5285a3388e8f86d7bc5fe0ed8b92bd4624
diff --git a/trunk/arch/sparc/mm/Makefile b/trunk/arch/sparc/mm/Makefile
@@ -4,13 +4,17 @@
 asflags-y := -ansi
 ccflags-y := -Werror
 
-obj-y                   := fault_$(BITS).o
+obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
+obj-y                   += fault_$(BITS).o
 obj-y                   += init_$(BITS).o
 obj-$(CONFIG_SPARC32)   += loadmmu.o
 obj-y                   += generic_$(BITS).o
 obj-$(CONFIG_SPARC32)   += extable.o btfixup.o srmmu.o iommu.o io-unit.o
 obj-$(CONFIG_SPARC32)   += hypersparc.o viking.o tsunami.o swift.o
 
+# Only used by sparc64
+obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
+
 # Only used by sparc32
 obj-$(CONFIG_HIGHMEM)   += highmem.o
 

diff --git a/trunk/arch/sparc64/mm/fault.c → trunk/arch/sparc/mm/fault_64.c b/trunk/arch/sparc64/mm/fault.c → trunk/arch/sparc/mm/fault_64.c
diff --git a/trunk/arch/sparc64/mm/generic.c → trunk/arch/sparc/mm/generic_64.c b/trunk/arch/sparc64/mm/generic.c → trunk/arch/sparc/mm/generic_64.c
diff --git a/trunk/arch/sparc64/mm/hugetlbpage.c → trunk/arch/sparc/mm/hugetlbpage.c b/trunk/arch/sparc64/mm/hugetlbpage.c → trunk/arch/sparc/mm/hugetlbpage.c
diff --git a/trunk/arch/sparc64/mm/init.c → trunk/arch/sparc/mm/init_64.c b/trunk/arch/sparc64/mm/init.c → trunk/arch/sparc/mm/init_64.c
@@ -50,7 +50,7 @@
 #include <asm/cpudata.h>
 #include <asm/irq.h>
 
-#include "init.h"
+#include "init_64.h"
 
 unsigned long kern_linear_pte_xor[2] __read_mostly;
 
@@ -954,7 +954,7 @@ int of_node_to_nid(struct device_node *dp)
 	return nid;
 }
 
-static void __init add_node_ranges(void)
+static void add_node_ranges(void)
 {
 	int i;
 

diff --git a/trunk/arch/sparc64/mm/init.h → trunk/arch/sparc/mm/init_64.h b/trunk/arch/sparc64/mm/init.h → trunk/arch/sparc/mm/init_64.h
diff --git a/trunk/arch/sparc64/mm/tlb.c → trunk/arch/sparc/mm/tlb.c b/trunk/arch/sparc64/mm/tlb.c → trunk/arch/sparc/mm/tlb.c
diff --git a/trunk/arch/sparc64/mm/tsb.c → trunk/arch/sparc/mm/tsb.c b/trunk/arch/sparc64/mm/tsb.c → trunk/arch/sparc/mm/tsb.c
diff --git a/trunk/arch/sparc64/mm/ultra.S → trunk/arch/sparc/mm/ultra.S b/trunk/arch/sparc64/mm/ultra.S → trunk/arch/sparc/mm/ultra.S
diff --git a/trunk/arch/sparc64/Makefile b/trunk/arch/sparc64/Makefile
@@ -27,7 +27,7 @@ endif
 
 head-y := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o
 
-core-y				+= arch/sparc64/kernel/ arch/sparc64/mm/
+core-y				+= arch/sparc64/kernel/ arch/sparc/mm/
 core-y				+= arch/sparc/math-emu/
 libs-y				+= arch/sparc64/prom/ arch/sparc64/lib/
 drivers-$(CONFIG_OPROFILE)	+= arch/sparc/oprofile/

diff --git a/trunk/arch/sparc64/mm/Makefile b/trunk/arch/sparc64/mm/Makefile