[PATCH] M68k misc compile fixes

Misc compile fixes for m68k:
  - missing and superfluous casts
  - unused code

diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c
index e0a82c31a4ecb37ff27f705d9fc754ed0cde0014..3cbd9d64d727daa88140ea233a3019476505caad 100644 (file)
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
@@ -59,8 +59,8 @@ void __init paging_init(void)
 #ifdef TEST_VERIFY_AREA
        wp_works_ok = 0;
 #endif
-       empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
-       memset((void *)empty_zero_page, 0, PAGE_SIZE);
+       empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
+       memset(empty_zero_page, 0, PAGE_SIZE);
 
        address = PAGE_OFFSET;
        pg_dir = swapper_pg_dir;

diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c
index 4e41b6e712fae8c4f0f77fb6f338d7b35446e10c..14fac8d9d017b7a145a2281f6b0dbd3bfe19b108 100644 (file)
--- a/arch/m68k/sun3/mmu_emu.c
+++ b/arch/m68k/sun3/mmu_emu.c
@@ -52,7 +52,8 @@ unsigned char pmeg_ctx[PMEGS_NUM];
 
 /* pointers to the mm structs for each task in each
    context. 0xffffffff is a marker for kernel context */
-struct mm_struct *ctx_alloc[CONTEXTS_NUM] = {0xffffffff, 0, 0, 0, 0, 0, 0, 0};
+struct mm_struct *ctx_alloc[CONTEXTS_NUM] = {(struct mm_struct *)0xffffffff, 
+                                            0, 0, 0, 0, 0, 0, 0};
 /* has this context been mmdrop'd? */
 static unsigned char ctx_avail = CONTEXTS_NUM-1;
 

diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c
index bd896d462b91c04018c6522bad3cc9a25193121a..b72f3c2eb65d36ac112b2866ea4816221ff5f075 100644 (file)
--- a/arch/m68k/sun3x/time.c
+++ b/arch/m68k/sun3x/time.c
@@ -79,6 +79,7 @@ unsigned long sun3x_gettimeoffset (void)
     return 0L;
 }
 
+#if 0
 static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs)
 {
     void (*vector)(int, void *, struct pt_regs *) = dev_id;
@@ -89,6 +90,7 @@ static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs)
     
     vector(irq, NULL, regs);
 }
+#endif
 
 void __init sun3x_sched_init(void (*vector)(int, void *, struct pt_regs *))
 {