Commit 9965a5d5 authored by Meelis Roos's avatar Meelis Roos Committed by Linus Torvalds

alpha: fix boot/main.c warning

In current 2.6.23-rc1+git, make bootimage gives the following warning while
compiling arch/alpha/boot/main.c.  The patch below fixes the warning by
casting callback argument explicitly to void*.  The original value comes from
START_ADDR macro and is clearly numeric so only cast it for the callback.

  CC      arch/alpha/boot/main.o
arch/alpha/boot/main.c: In function 'load':
arch/alpha/boot/main.c:135: warning: passing argument 3 of 'callback_read' makes pointer from integer without a cast
Signed-off-by: default avatarMeelis Roos <mroos@linux.ee>
Cc: Jay Estabrook <jay.estabrook@hp.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1b2becff
...@@ -132,7 +132,7 @@ static inline long load(long dev, unsigned long addr, unsigned long count) ...@@ -132,7 +132,7 @@ static inline long load(long dev, unsigned long addr, unsigned long count)
if (result) if (result)
srm_printk("Boot file specification (%s) not implemented\n", srm_printk("Boot file specification (%s) not implemented\n",
bootfile); bootfile);
return callback_read(dev, count, addr, boot_size/512 + 1); return callback_read(dev, count, (void *)addr, boot_size/512 + 1);
} }
/* /*
......
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