2005-09-14 22:27:37

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 5/10] UML - Remove some build warnings

These ugly double-casts are the result of gdb complaining about size
differences when casting between ints and pointers.

Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.13-mm2/arch/um/os-Linux/aio.c
===================================================================
--- linux-2.6.13-mm2.orig/arch/um/os-Linux/aio.c 2005-09-08 11:18:05.000000000 -0400
+++ linux-2.6.13-mm2/arch/um/os-Linux/aio.c 2005-09-08 11:29:22.000000000 -0400
@@ -142,7 +142,7 @@
"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;
Index: linux-2.6.13-mm2/arch/um/os-Linux/elf_aux.c
===================================================================
--- linux-2.6.13-mm2.orig/arch/um/os-Linux/elf_aux.c 2005-09-08 11:18:05.000000000 -0400
+++ linux-2.6.13-mm2/arch/um/os-Linux/elf_aux.c 2005-09-08 11:29:22.000000000 -0400
@@ -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 @@
* 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;