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: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c37ddd936d
commit
27137e5285
@ -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
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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/
|
||||
|
@ -1,9 +0,0 @@
|
||||
# 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
|
Loading…
Reference in New Issue
Block a user