diff options
Diffstat (limited to 'arch/um')
-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) | |||
142 | "errno = %d\n", errno); | 142 | "errno = %d\n", errno); |
143 | } | 143 | } |
144 | else { | 144 | else { |
145 | aio = (struct aio_context *) event.data; | 145 | aio = (struct aio_context *) (long) event.data; |
146 | if(update_aio(aio, event.res)){ | 146 | if(update_aio(aio, event.res)){ |
147 | do_aio(ctx, aio); | 147 | do_aio(ctx, aio); |
148 | continue; | 148 | 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 @@ | |||
9 | */ | 9 | */ |
10 | #include <elf.h> | 10 | #include <elf.h> |
11 | #include <stddef.h> | 11 | #include <stddef.h> |
12 | #include <asm/elf.h> | ||
12 | #include "init.h" | 13 | #include "init.h" |
13 | #include "elf_user.h" | 14 | #include "elf_user.h" |
14 | #include "mem_user.h" | 15 | #include "mem_user.h" |
@@ -54,7 +55,8 @@ __init void scan_elf_aux( char **envp) | |||
54 | * a_un, so we have to use a_val, which is | 55 | * a_un, so we have to use a_val, which is |
55 | * all that's left. | 56 | * all that's left. |
56 | */ | 57 | */ |
57 | elf_aux_platform = (char *) auxv->a_un.a_val; | 58 | elf_aux_platform = |
59 | (char *) (long) auxv->a_un.a_val; | ||
58 | break; | 60 | break; |
59 | case AT_PAGESZ: | 61 | case AT_PAGESZ: |
60 | page_size = auxv->a_un.a_val; | 62 | page_size = auxv->a_un.a_val; |