X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fum%2Fos-Linux%2Felf_aux.c;h=5a99dd3fbed0477bb7443eba1324e70f0dc4bcf4;hb=c85749e6d1df55ca5b23cb1d220ed7df92df8d78;hp=9416e1c299269d6f988c9f75f8e6f8ae94e41575;hpb=a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e;p=powerpc.git

diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c
index 9416e1c299..5a99dd3fbe 100644
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
@@ -9,12 +9,13 @@
  */
 #include <elf.h>
 #include <stddef.h>
-#include <asm/elf.h>
 #include "init.h"
 #include "elf_user.h"
 #include "mem_user.h"
+#include <kern_constants.h>
 
-#if ELF_CLASS == ELFCLASS32
+/* Use the one from the kernel - the host may miss it, if having old headers. */
+#if UM_ELF_CLASS == UM_ELFCLASS32
 typedef Elf32_auxv_t elf_auxv_t;
 #else
 typedef Elf64_auxv_t elf_auxv_t;
@@ -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;