diff options
| author | Meelis Roos <mroos@linux.ee> | 2007-07-31 00:38:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 15:39:39 -0700 |
| commit | 9965a5d5a5aab575f995ba58dc80285aa0f6ecbf (patch) | |
| tree | f3783e0a0b73a0528b5e31745e078190fd1984fc /arch/alpha/boot/main.c | |
| parent | 1b2becffeed47ce88316724d1ee4cdbc7ee0180e (diff) | |
| download | op-kernel-dev-9965a5d5a5aab575f995ba58dc80285aa0f6ecbf.zip op-kernel-dev-9965a5d5a5aab575f995ba58dc80285aa0f6ecbf.tar.gz | |
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: Meelis 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha/boot/main.c')
| -rw-r--r-- | arch/alpha/boot/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c index 90ed55b..89f3be0 100644 --- a/arch/alpha/boot/main.c +++ b/arch/alpha/boot/main.c @@ -132,7 +132,7 @@ static inline long load(long dev, unsigned long addr, unsigned long count) if (result) srm_printk("Boot file specification (%s) not implemented\n", bootfile); - return callback_read(dev, count, addr, boot_size/512 + 1); + return callback_read(dev, count, (void *)addr, boot_size/512 + 1); } /* |
