sparc: prepare mm/ for unification

- rename files where sparc64 has similar files to _32.c - Restructure Makefile - Sneak in -Werror as we have for sparc64 Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Dec 4, 2008 · c37ddd9 · c37ddd9
1 parent 7c979c4
commit c37ddd9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/arch/sparc/mm/Makefile b/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/arch/sparc/mm/fault.c → arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault.c → arch/sparc/mm/fault_32.c
diff --git a/arch/sparc/mm/generic.c → arch/sparc/mm/generic_32.c b/arch/sparc/mm/generic.c → arch/sparc/mm/generic_32.c
diff --git a/arch/sparc/mm/init.c → arch/sparc/mm/init_32.c b/arch/sparc/mm/init.c → arch/sparc/mm/init_32.c