diff options
author | Jeff Dike <jdike@addtoit.com> | 2005-09-16 19:27:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-17 11:50:00 -0700 |
commit | 64b7673f91c0c3614028c5942b0d6a91d0b64a98 (patch) | |
tree | 7fd0f41a2b9f54bba8a760fdf16e2d08f9442dc8 /arch | |
parent | d9f0d9151083a9a77331a020a7fee498cf828e3b (diff) | |
download | talos-obmc-linux-64b7673f91c0c3614028c5942b0d6a91d0b64a98.tar.gz talos-obmc-linux-64b7673f91c0c3614028c5942b0d6a91d0b64a98.zip |
[PATCH] uml: Remove some build warnings
These ugly double-casts are the result of gdb complaining about size
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/os-Linux/aio.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/elf_aux.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c index b04897cd995d..182905be869e 100644 --- a/arch/um/os-Linux/aio.c +++ b/arch/um/os-Linux/aio.c @@ -142,7 +142,7 @@ static int aio_thread(void *arg) "errno = %d\n", errno); } else { - aio = (struct aio_context *) event.data; + aio = (struct aio_context *) (long) event.data; if(update_aio(aio, event.res)){ do_aio(ctx, aio); continue; diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c index 1399520a8588..5c02e3395225 100644 --- a/arch/um/os-Linux/elf_aux.c +++ b/arch/um/os-Linux/elf_aux.c @@ -9,6 +9,7 @@ */ #include <elf.h> #include <stddef.h> +#include <asm/elf.h> #include "init.h" #include "elf_user.h" #include "mem_user.h" @@ -54,7 +55,8 @@ __init void scan_elf_aux( char **envp) * a_un, so we have to use a_val, which is * all that's left. */ - elf_aux_platform = (char *) auxv->a_un.a_val; + elf_aux_platform = + (char *) (long) auxv->a_un.a_val; break; case AT_PAGESZ: page_size = auxv->a_un.a_val; |