[PATCH] m68k unused cruft removal

M68k: Remove obsolete cruft

diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S
index 015a53a80c4cbb2a7cd2d37ea90f1b8a2b5a3c09..d8a095061dcd88c177305413905eb0335d688bf0 100644 (file)
--- a/arch/m68k/kernel/sun3-head.S
+++ b/arch/m68k/kernel/sun3-head.S
@@ -16,9 +16,6 @@ SUN3_INVALID_PMEG = 255
 .globl bootup_user_stack
 .globl bootup_kernel_stack
 .globl pg0
-.globl empty_bad_page
-.globl empty_bad_page_table
-.globl empty_zero_page
 .globl swapper_pg_dir
 .globl kernel_pmd_table
 .globl availmem
@@ -27,10 +24,7 @@ SUN3_INVALID_PMEG = 255
 | todo: all these should be in bss!
 swapper_pg_dir:                .skip 0x2000
 pg0:                           .skip 0x2000
-empty_bad_page:                .skip 0x2000
-empty_bad_page_table:          .skip 0x2000
 kernel_pmd_table:              .skip 0x2000
-empty_zero_page:               .skip 0x2000
 
 .globl kernel_pg_dir
 .equ    kernel_pg_dir,kernel_pmd_table

diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
index b0887b8fdadc70712207eaf7d0a8554705b34135..a8ce74a1226ab0fda0885aeea5e3bbc06a5c446d 100644 (file)
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
@@ -196,9 +196,6 @@ map_chunk (unsigned long addr, long size)
        return virtaddr;
 }
 
-extern unsigned long empty_bad_page_table;
-extern unsigned long empty_bad_page;
-
 /*
  * paging_init() continues the virtual memory environment setup which
  * was begun by the code in arch/head.S.

diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c
index 3cbd9d64d727daa88140ea233a3019476505caad..dd34111704721038cec29cde3d553d3a9aff9f85 100644 (file)
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
@@ -33,8 +33,6 @@ extern void mmu_emu_init (unsigned long bootmem_end);
 
 const char bad_pmd_string[] = "Bad pmd in pte_alloc: %08lx\n";
 
-extern unsigned long empty_bad_page_table;
-extern unsigned long empty_bad_page;
 extern unsigned long num_pages;
 
 void free_initmem(void)

diff --git a/include/asm-m68k/sun3_pgalloc.h b/include/asm-m68k/sun3_pgalloc.h
index c30e1b6a50cb61da061c05e787e8b9ef7c0003b0..94f257d93c23dd97109d66c30feb7bf62bf3aaf9 100644 (file)
--- a/include/asm-m68k/sun3_pgalloc.h
+++ b/include/asm-m68k/sun3_pgalloc.h
@@ -95,14 +95,4 @@ static inline pgd_t * pgd_alloc(struct mm_struct *mm)
 
 #define pgd_populate(mm, pmd, pte) BUG()
 
-
-/* Reserved PMEGs. */
-extern char sun3_reserved_pmeg[SUN3_PMEGS_NUM];
-extern unsigned long pmeg_vaddr[SUN3_PMEGS_NUM];
-extern unsigned char pmeg_alloc[SUN3_PMEGS_NUM];
-extern unsigned char pmeg_ctx[SUN3_PMEGS_NUM];
-
-
-#define check_pgt_cache()      do { } while (0)
-
 #endif /* SUN3_PGALLOC_H */