Commit e7eaf5b8 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: remove calls to sun4c dummy mm inits functions 



Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c1cfb2d

arch/sparc/mm/fault_32.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

arch/sparc/mm/init_32.c

+0 −8
Original line number Diff line number Diff line
@@ -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 */

arch/sparc/mm/loadmmu.c

+0 −5
Original line number Diff line number Diff line
@@ -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:

arch/sparc/mm/nosun4c.c

+0 −23
Original line number Diff line number Diff line
@@ -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;