Commit 27137e52 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller

sparc,sparc64: unify mm/

- move all sparc64/mm/ files to arch/sparc/mm/
- commonly named files are named _64.c
- add files to sparc/mm/Makefile preserving link order
- delete now unused sparc64/mm/Makefile
- sparc64 now finds mm/ in sparc
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c37ddd93
...@@ -4,13 +4,17 @@ ...@@ -4,13 +4,17 @@
asflags-y := -ansi asflags-y := -ansi
ccflags-y := -Werror 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-y += init_$(BITS).o
obj-$(CONFIG_SPARC32) += loadmmu.o obj-$(CONFIG_SPARC32) += loadmmu.o
obj-y += generic_$(BITS).o obj-y += generic_$(BITS).o
obj-$(CONFIG_SPARC32) += extable.o btfixup.o srmmu.o iommu.o io-unit.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 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 # Only used by sparc32
obj-$(CONFIG_HIGHMEM) += highmem.o obj-$(CONFIG_HIGHMEM) += highmem.o
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include <asm/cpudata.h> #include <asm/cpudata.h>
#include <asm/irq.h> #include <asm/irq.h>
#include "init.h" #include "init_64.h"
unsigned long kern_linear_pte_xor[2] __read_mostly; unsigned long kern_linear_pte_xor[2] __read_mostly;
...@@ -954,7 +954,7 @@ int of_node_to_nid(struct device_node *dp) ...@@ -954,7 +954,7 @@ int of_node_to_nid(struct device_node *dp)
return nid; return nid;
} }
static void __init add_node_ranges(void) static void add_node_ranges(void)
{ {
int i; int i;
......
...@@ -27,7 +27,7 @@ endif ...@@ -27,7 +27,7 @@ endif
head-y := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o 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/ core-y += arch/sparc/math-emu/
libs-y += arch/sparc64/prom/ arch/sparc64/lib/ libs-y += arch/sparc64/prom/ arch/sparc64/lib/
drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
......
# Makefile for the linux Sparc64-specific parts of the memory manager.
#
EXTRA_AFLAGS := -ansi
EXTRA_CFLAGS := -Werror
obj-y := ultra.o tlb.o tsb.o fault.o init.o generic.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment