summaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/elf_aux.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2005-06-08 15:48:01 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:21:12 -0700
commitda00d9a5466558ccd9e7b7d04b13d7cb9160c876 (patch)
tree4edc27caa63126e902da3752f58adb8ee792762c /arch/um/os-Linux/elf_aux.c
parent3df59529ad1045da61698bb5dd8ebaa547aeb46f (diff)
downloadblackbird-op-linux-da00d9a5466558ccd9e7b7d04b13d7cb9160c876.tar.gz
blackbird-op-linux-da00d9a5466558ccd9e7b7d04b13d7cb9160c876.zip
[PATCH] uml: compile fixes for gcc 4
This is a bunch of compile fixes provoked by building UML with gcc 4. There are a bunch of signedness mismatches, a couple of uninitialized references, and a botched C99 structure initialization which had somehow gone unnoticed. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/os-Linux/elf_aux.c')
-rw-r--r--arch/um/os-Linux/elf_aux.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c
index 9aee0b62ebca..f0d6060e3e57 100644
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
@@ -45,7 +45,11 @@ __init void scan_elf_aux( char **envp)
elf_aux_hwcap = auxv->a_un.a_val;
break;
case AT_PLATFORM:
- elf_aux_platform = auxv->a_un.a_ptr;
+ /* elf.h removed the pointer elements from
+ * a_un, so we have to use a_val, which is
+ * all that's left.
+ */
+ elf_aux_platform = (char *) auxv->a_un.a_val;
break;
case AT_PAGESZ:
page_size = auxv->a_un.a_val;
OpenPOWER on IntegriCloud