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>

diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index df3155a179918e0ad5e9741eceab601ae93d8abb..f3e6921712bb0f5e8591a1e24c4247ff6f56d767 100644 (file)
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -60,14 +60,11 @@ unsigned long probe_memory(void)
        return total;
 }
 
-extern void sun4c_complete_all_stores(void);
-
 /* Whee, a level 15 NMI interrupt memory error.  Let's have fun... */
 asmlinkage void sparc_lvl15_nmi(struct pt_regs *regs, unsigned long serr,
                                unsigned long svaddr, unsigned long aerr,
                                unsigned long avaddr)
 {
-       sun4c_complete_all_stores();
        printk("FAULT: NMI received\n");
        printk("SREGS: Synchronous Error %08lx\n", serr);
        printk("       Synchronous Vaddr %08lx\n", svaddr);

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index c5f9021b1a01fb7c5c6c6c1ce61563190590273a..15848e7ea049b4d0d5f3a9fcf3e307addd7a3323 100644 (file)
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -308,7 +308,6 @@ void check_pgt_cache(void)
  * init routine based upon the Sun model type on the Sparc.
  *
  */
-extern void sun4c_paging_init(void);
 extern void srmmu_paging_init(void);
 extern void device_scan(void);
 
@@ -318,13 +317,6 @@ EXPORT_SYMBOL(PAGE_SHARED);
 void __init paging_init(void)
 {
        switch(sparc_cpu_model) {
-       case sun4c:
-       case sun4e:
-       case sun4:
-               sun4c_paging_init();
-               sparc_unmapped_base = 0xe0000000;
-               BTFIXUPSET_SETHI(sparc_unmapped_base, 0xe0000000);
-               break;
        case sparc_leon:
                leon_init();
                /* fall through */

diff --git a/arch/sparc/mm/loadmmu.c b/arch/sparc/mm/loadmmu.c
index c5bf2a6c38585f9495d0e106101fcfd110e9b27f..49c396da0b7e43debfffcae2976749a2984d1a78 100644 (file)
--- a/arch/sparc/mm/loadmmu.c
+++ b/arch/sparc/mm/loadmmu.c
@@ -20,16 +20,11 @@ struct ctx_list *ctx_list_pool;
 struct ctx_list ctx_free;
 struct ctx_list ctx_used;
 
-extern void ld_mmu_sun4c(void);
 extern void ld_mmu_srmmu(void);
 
 void __init load_mmu(void)
 {
        switch(sparc_cpu_model) {
-       case sun4c:
-       case sun4:
-               ld_mmu_sun4c();
-               break;
        case sun4m:
        case sun4d:
        case sparc_leon:

diff --git a/arch/sparc/mm/nosun4c.c b/arch/sparc/mm/nosun4c.c
index 4e62c27147c491843bf3747307cc3bc39e196d79..0e0e8cfd21aad6cf7e59b0f0d3a0456a82f643dc 100644 (file)
--- a/arch/sparc/mm/nosun4c.c
+++ b/arch/sparc/mm/nosun4c.c
@@ -29,29 +29,6 @@ static void __init should_not_happen(void)
        prom_halt();
 }
 
-unsigned long __init sun4c_paging_init(unsigned long start_mem, unsigned long end_mem)
-{
-       should_not_happen();
-       return 0;
-}
-
-void __init ld_mmu_sun4c(void)
-{
-       should_not_happen();
-}
-
-void sun4c_mapioaddr(unsigned long physaddr, unsigned long virt_addr, int bus_type, int rdonly)
-{
-}
-
-void sun4c_unmapioaddr(unsigned long virt_addr)
-{
-}
-
-void sun4c_complete_all_stores(void)
-{
-}
-
 pte_t *sun4c_pte_offset(pmd_t * dir, unsigned long address)
 {
        return NULL;