---

yaml --- r: 123331 b: refs/heads/master c: c37ddd9 h: refs/heads/master i: 123329: 4e20b78 123327: ee35405 v: v3
git-mirror · Dec 4, 2008 · 82874e7 · 82874e7
1 parent 9a593e9
commit 82874e7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c979c49c9882badee45c0a7a3dbca1040b7ba73
+refs/heads/master: c37ddd936d96b46cf2bb17e7b1a18b2bd24ec1fb
diff --git a/trunk/arch/sparc/mm/Makefile b/trunk/arch/sparc/mm/Makefile
@@ -1,17 +1,21 @@
 # Makefile for the linux Sparc-specific parts of the memory manager.
 #
 
-EXTRA_AFLAGS := -ansi
+asflags-y := -ansi
+ccflags-y := -Werror
 
-obj-y	:= fault.o init.o loadmmu.o generic.o extable.o btfixup.o \
-	    srmmu.o iommu.o io-unit.o hypersparc.o viking.o tsunami.o swift.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
 
-ifdef CONFIG_HIGHMEM
-obj-y	+= highmem.o
-endif
+# Only used by sparc32
+obj-$(CONFIG_HIGHMEM)   += highmem.o
 
 ifdef CONFIG_SMP
-obj-y   += nosun4c.o
+obj-$(CONFIG_SPARC32) += nosun4c.o
 else
-obj-y   += sun4c.o
+obj-$(CONFIG_SPARC32) += sun4c.o
 endif
diff --git a/trunk/arch/sparc/mm/fault.c → trunk/arch/sparc/mm/fault_32.c b/trunk/arch/sparc/mm/fault.c → trunk/arch/sparc/mm/fault_32.c
diff --git a/trunk/arch/sparc/mm/generic.c → trunk/arch/sparc/mm/generic_32.c b/trunk/arch/sparc/mm/generic.c → trunk/arch/sparc/mm/generic_32.c
diff --git a/trunk/arch/sparc/mm/init.c → trunk/arch/sparc/mm/init_32.c b/trunk/arch/sparc/mm/init.c → trunk/arch/sparc/mm/init_32.c