lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc32: drop loadmmu

Browse Source 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sam Ravnborg
2012-05-12 20:35:52 +02:00
committed by David S. Miller
parent f167edaee0
commit a3c5c6637b
3 changed files with 6 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sparc/mm/Makefile
View File

@@ -7,7 +7,6 @@ ccflags-y := -Werror
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
obj-y += fault_$(BITS).o obj-y += fault_$(BITS).o
obj-y += init_$(BITS).o obj-y += init_$(BITS).o
obj-$(CONFIG_SPARC32) += loadmmu.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
obj-$(CONFIG_SPARC_LEON)+= leon_mm.o obj-$(CONFIG_SPARC_LEON)+= leon_mm.o

38
arch/sparc/mm/loadmmu.c
View File

@@ -1,38 +0,0 @@
/*
* loadmmu.c: This code loads up all the mm function pointers once the
* machine type has been determined. It also sets the static
* mmu values such as PAGE_NONE, etc.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
* Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
#include <asm/oplib.h>
struct ctx_list *ctx_list_pool;
struct ctx_list ctx_free;
struct ctx_list ctx_used;
extern void ld_mmu_srmmu(void);
void __init load_mmu(void)
{
switch(sparc_cpu_model) {
case sun4m:
case sun4d:
case sparc_leon:
ld_mmu_srmmu();
break;
default:
prom_printf("load_mmu: %d unsupported\n", (int)sparc_cpu_model);
prom_halt();
}
btfixup();
}

7
arch/sparc/mm/srmmu.c
View File

@@ -55,6 +55,10 @@ static unsigned int hwbug_bitmask;
int vac_cache_size; int vac_cache_size;
int vac_line_size; int vac_line_size;
struct ctx_list *ctx_list_pool;
struct ctx_list ctx_free;
struct ctx_list ctx_used;
extern struct resource sparc_iomap; extern struct resource sparc_iomap;
extern unsigned long last_valid_pfn; extern unsigned long last_valid_pfn;
@@ -2055,7 +2059,7 @@ static void smp_flush_page_for_dma(unsigned long page)
#endif #endif
/* Load up routines and constants for sun4m and sun4d mmu */ /* Load up routines and constants for sun4m and sun4d mmu */
void __init ld_mmu_srmmu(void) void __init load_mmu(void)
{ {
extern void ld_mmu_iommu(void); extern void ld_mmu_iommu(void);
extern void ld_mmu_iounit(void); extern void ld_mmu_iounit(void);
@@ -2170,4 +2174,5 @@ void __init ld_mmu_srmmu(void)
else else
sun4m_init_smp(); sun4m_init_smp();
#endif #endif
btfixup();
} }