Commit f06d0bf1 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] M68k misc compile fixes

Misc compile fixes for m68k:
  - missing and superfluous casts
  - unused code
parent 406b7302
...@@ -59,8 +59,8 @@ void __init paging_init(void) ...@@ -59,8 +59,8 @@ void __init paging_init(void)
#ifdef TEST_VERIFY_AREA #ifdef TEST_VERIFY_AREA
wp_works_ok = 0; wp_works_ok = 0;
#endif #endif
empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE); empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
memset((void *)empty_zero_page, 0, PAGE_SIZE); memset(empty_zero_page, 0, PAGE_SIZE);
address = PAGE_OFFSET; address = PAGE_OFFSET;
pg_dir = swapper_pg_dir; pg_dir = swapper_pg_dir;
......
...@@ -52,7 +52,8 @@ unsigned char pmeg_ctx[PMEGS_NUM]; ...@@ -52,7 +52,8 @@ unsigned char pmeg_ctx[PMEGS_NUM];
/* pointers to the mm structs for each task in each /* pointers to the mm structs for each task in each
context. 0xffffffff is a marker for kernel context */ 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? */ /* has this context been mmdrop'd? */
static unsigned char ctx_avail = CONTEXTS_NUM-1; static unsigned char ctx_avail = CONTEXTS_NUM-1;
......
...@@ -79,6 +79,7 @@ unsigned long sun3x_gettimeoffset (void) ...@@ -79,6 +79,7 @@ unsigned long sun3x_gettimeoffset (void)
return 0L; return 0L;
} }
#if 0
static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs) static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs)
{ {
void (*vector)(int, void *, struct pt_regs *) = dev_id; 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) ...@@ -89,6 +90,7 @@ static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs)
vector(irq, NULL, regs); vector(irq, NULL, regs);
} }
#endif
void __init sun3x_sched_init(void (*vector)(int, void *, struct pt_regs *)) void __init sun3x_sched_init(void (*vector)(int, void *, struct pt_regs *))
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment