diff options
| -rw-r--r-- | arch/sparc/mm/Makefile | 6 | ||||
| -rw-r--r-- | arch/sparc/mm/fault_64.c (renamed from arch/sparc64/mm/fault.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/mm/generic_64.c (renamed from arch/sparc64/mm/generic.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/mm/hugetlbpage.c (renamed from arch/sparc64/mm/hugetlbpage.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/mm/init_64.c (renamed from arch/sparc64/mm/init.c) | 4 | ||||
| -rw-r--r-- | arch/sparc/mm/init_64.h (renamed from arch/sparc64/mm/init.h) | 0 | ||||
| -rw-r--r-- | arch/sparc/mm/tlb.c (renamed from arch/sparc64/mm/tlb.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/mm/tsb.c (renamed from arch/sparc64/mm/tsb.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/mm/ultra.S (renamed from arch/sparc64/mm/ultra.S) | 0 | ||||
| -rw-r--r-- | arch/sparc64/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc64/mm/Makefile | 9 |
11 files changed, 8 insertions, 13 deletions
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile index 3ad1b1f9953..681abe0a459 100644 --- a/arch/sparc/mm/Makefile +++ b/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/arch/sparc64/mm/fault.c b/arch/sparc/mm/fault_64.c index a9e474bf638..a9e474bf638 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc/mm/fault_64.c diff --git a/arch/sparc64/mm/generic.c b/arch/sparc/mm/generic_64.c index f362c203701..f362c203701 100644 --- a/arch/sparc64/mm/generic.c +++ b/arch/sparc/mm/generic_64.c diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c index f27d10369e0..f27d10369e0 100644 --- a/arch/sparc64/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c diff --git a/arch/sparc64/mm/init.c b/arch/sparc/mm/init_64.c index 4bd63968400..6ea73da2931 100644 --- a/arch/sparc64/mm/init.c +++ b/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/arch/sparc64/mm/init.h b/arch/sparc/mm/init_64.h index 16063870a48..16063870a48 100644 --- a/arch/sparc64/mm/init.h +++ b/arch/sparc/mm/init_64.h diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc/mm/tlb.c index d8f21e24a82..d8f21e24a82 100644 --- a/arch/sparc64/mm/tlb.c +++ b/arch/sparc/mm/tlb.c diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc/mm/tsb.c index f0282fad632..f0282fad632 100644 --- a/arch/sparc64/mm/tsb.c +++ b/arch/sparc/mm/tsb.c diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc/mm/ultra.S index e4c146f7c7e..e4c146f7c7e 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc/mm/ultra.S diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index 3dbda408572..bfe08680c89 100644 --- a/arch/sparc64/Makefile +++ b/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/arch/sparc64/mm/Makefile b/arch/sparc64/mm/Makefile deleted file mode 100644 index 68d04c0370f..00000000000 --- a/arch/sparc64/mm/Makefile +++ /dev/null @@ -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 |