projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/hda' into for-linus
[profile/ivi/kernel-x86-ivi.git]
/
fs
/
eventfd.c
diff --git
a/fs/eventfd.c
b/fs/eventfd.c
index
08bf558
..
5de2c2d
100644
(file)
--- a/
fs/eventfd.c
+++ b/
fs/eventfd.c
@@
-198,7
+198,7
@@
struct file *eventfd_fget(int fd)
return file;
}
return file;
}
-
asmlinkage long sys_eventfd2(unsigned int count, int
flags)
+
SYSCALL_DEFINE2(eventfd2, unsigned int, count, int,
flags)
{
int fd;
struct eventfd_ctx *ctx;
{
int fd;
struct eventfd_ctx *ctx;
@@
-228,8
+228,7
@@
asmlinkage long sys_eventfd2(unsigned int count, int flags)
return fd;
}
return fd;
}
-
asmlinkage long sys_eventfd(unsigned int
count)
+
SYSCALL_DEFINE1(eventfd, unsigned int,
count)
{
return sys_eventfd2(count, 0);
}
{
return sys_eventfd2(count, 0);
}
-