aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-05-11 07:35:05 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-11 22:27:45 -0400
commite7eaf5b8abb836785a512fa7e9348dc6b0d7bc81 (patch)
tree99cd8602e53e7aa9798b3da6ae0c52b1565186a2 /arch/sparc/mm
parent2c1cfb2db61474040a394962872f4cde613f89fb (diff)
sparc32: remove calls to sun4c dummy mm inits functions
Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r--arch/sparc/mm/fault_32.c3
-rw-r--r--arch/sparc/mm/init_32.c8
-rw-r--r--arch/sparc/mm/loadmmu.c5
-rw-r--r--arch/sparc/mm/nosun4c.c23
4 files changed, 0 insertions, 39 deletions
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index df3155a17991..f3e6921712bb 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -60,14 +60,11 @@ unsigned long probe_memory(void)
60 return total; 60 return total;
61} 61}
62 62
63extern void sun4c_complete_all_stores(void);
64
65/* Whee, a level 15 NMI interrupt memory error. Let's have fun... */ 63/* Whee, a level 15 NMI interrupt memory error. Let's have fun... */
66asmlinkage void sparc_lvl15_nmi(struct pt_regs *regs, unsigned long serr, 64asmlinkage void sparc_lvl15_nmi(struct pt_regs *regs, unsigned long serr,
67 unsigned long svaddr, unsigned long aerr, 65 unsigned long svaddr, unsigned long aerr,
68 unsigned long avaddr) 66 unsigned long avaddr)
69{ 67{
70 sun4c_complete_all_stores();
71 printk("FAULT: NMI received\n"); 68 printk("FAULT: NMI received\n");
72 printk("SREGS: Synchronous Error %08lx\n", serr); 69 printk("SREGS: Synchronous Error %08lx\n", serr);
73 printk(" Synchronous Vaddr %08lx\n", svaddr); 70 printk(" Synchronous Vaddr %08lx\n", svaddr);
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index c5f9021b1a01..15848e7ea049 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -308,7 +308,6 @@ void check_pgt_cache(void)
308 * init routine based upon the Sun model type on the Sparc. 308 * init routine based upon the Sun model type on the Sparc.
309 * 309 *
310 */ 310 */
311extern void sun4c_paging_init(void);
312extern void srmmu_paging_init(void); 311extern void srmmu_paging_init(void);
313extern void device_scan(void); 312extern void device_scan(void);
314 313
@@ -318,13 +317,6 @@ EXPORT_SYMBOL(PAGE_SHARED);
318void __init paging_init(void) 317void __init paging_init(void)
319{ 318{
320 switch(sparc_cpu_model) { 319 switch(sparc_cpu_model) {
321 case sun4c:
322 case sun4e:
323 case sun4:
324 sun4c_paging_init();
325 sparc_unmapped_base = 0xe0000000;
326 BTFIXUPSET_SETHI(sparc_unmapped_base, 0xe0000000);
327 break;
328 case sparc_leon: 320 case sparc_leon:
329 leon_init(); 321 leon_init();
330 /* fall through */ 322 /* fall through */
diff --git a/arch/sparc/mm/loadmmu.c b/arch/sparc/mm/loadmmu.c
index c5bf2a6c3858..49c396da0b7e 100644
--- a/arch/sparc/mm/loadmmu.c
+++ b/arch/sparc/mm/loadmmu.c
@@ -20,16 +20,11 @@ struct ctx_list *ctx_list_pool;
20struct ctx_list ctx_free; 20struct ctx_list ctx_free;
21struct ctx_list ctx_used; 21struct ctx_list ctx_used;
22 22
23extern void ld_mmu_sun4c(void);
24extern void ld_mmu_srmmu(void); 23extern void ld_mmu_srmmu(void);
25 24
26void __init load_mmu(void) 25void __init load_mmu(void)
27{ 26{
28 switch(sparc_cpu_model) { 27 switch(sparc_cpu_model) {
29 case sun4c:
30 case sun4:
31 ld_mmu_sun4c();
32 break;
33 case sun4m: 28 case sun4m:
34 case sun4d: 29 case sun4d:
35 case sparc_leon: 30 case sparc_leon:
diff --git a/arch/sparc/mm/nosun4c.c b/arch/sparc/mm/nosun4c.c
index 4e62c27147c4..0e0e8cfd21aa 100644
--- a/arch/sparc/mm/nosun4c.c
+++ b/arch/sparc/mm/nosun4c.c
@@ -29,29 +29,6 @@ static void __init should_not_happen(void)
29 prom_halt(); 29 prom_halt();
30} 30}
31 31
32unsigned long __init sun4c_paging_init(unsigned long start_mem, unsigned long end_mem)
33{
34 should_not_happen();
35 return 0;
36}
37
38void __init ld_mmu_sun4c(void)
39{
40 should_not_happen();
41}
42
43void sun4c_mapioaddr(unsigned long physaddr, unsigned long virt_addr, int bus_type, int rdonly)
44{
45}
46
47void sun4c_unmapioaddr(unsigned long virt_addr)
48{
49}
50
51void sun4c_complete_all_stores(void)
52{
53}
54
55pte_t *sun4c_pte_offset(pmd_t * dir, unsigned long address) 32pte_t *sun4c_pte_offset(pmd_t * dir, unsigned long address)
56{ 33{
57 return NULL; 34 return NULL;