diff options
author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /arch/um/os-Linux/aio.c | |
parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) |
Merge from Linus' tree.
Diffstat (limited to 'arch/um/os-Linux/aio.c')
-rw-r--r-- | arch/um/os-Linux/aio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c index 298d5632128b..f6e64026f995 100644 --- a/arch/um/os-Linux/aio.c +++ b/arch/um/os-Linux/aio.c | |||
@@ -144,6 +144,7 @@ static int aio_thread(void *arg) | |||
144 | "errno = %d\n", errno); | 144 | "errno = %d\n", errno); |
145 | } | 145 | } |
146 | else { | 146 | else { |
147 | /* This is safe as we've just a pointer here. */ | ||
147 | aio = (struct aio_context *) (long) event.data; | 148 | aio = (struct aio_context *) (long) event.data; |
148 | if(update_aio(aio, event.res)){ | 149 | if(update_aio(aio, event.res)){ |
149 | do_aio(ctx, aio); | 150 | do_aio(ctx, aio); |