Fix compiling UML

From: Ulrich Drepper
Date: Mon Jul 23 2007 - 01:53:21 EST


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The following patch is needed to get 2.6.23-rc1 to compile for UML
on x86-64.


Signed-off-by: Ulrich Drepper <drepper@xxxxxxxxxx>

diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
index b126df4..9c70cb0 100644
- --- a/arch/um/os-Linux/aio.c
+++ b/arch/um/os-Linux/aio.c
@@ -75,9 +75,10 @@ static int do_aio(aio_context_t ctx, enum aio_type type, int fd, char *buf,
.aio_buf = (unsigned long) buf,
.aio_nbytes = len,
.aio_offset = offset,
+ .aio_flags = 0,
+ .aio_resfd = 0,
.aio_reserved1 = 0,
- - .aio_reserved2 = 0,
- - .aio_reserved3 = 0 });
+ .aio_reserved2 = 0 });

switch(type){
case AIO_READ:

- --
â Ulrich Drepper â Red Hat, Inc. â 444 Castro St â Mountain View, CA â
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)

iD8DBQFGpEIN2ijCOnn/RHQRAsTjAJ9Rs6wJFPxQ/ivqK3yaC5pymtcGhACgzWID
l2vwUwABAk8mAiw/g+7y3U0=
=bPu6
-----END PGP SIGNATURE-----
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/