git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
[sfrench/cifs-2.6.git]
/
fs
/
aio.c
diff --git
a/fs/aio.c
b/fs/aio.c
index 1dc8786f4588355245a90063e02464ff35e07760..6db8745c2edd7b8c5143531df9c9cd21e7a7dbb5 100644
(file)
--- a/
fs/aio.c
+++ b/
fs/aio.c
@@
-1790,7
+1790,5
@@
SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
ret = read_events(ioctx, min_nr, nr, events, timeout);
put_ioctx(ioctx);
}
-
- asmlinkage_protect(5, ret, ctx_id, min_nr, nr, events, timeout);
return ret;
}