diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /kernel/sys_ni.c | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'kernel/sys_ni.c')
| -rw-r--r-- | kernel/sys_ni.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 5b9b467de070..0fea0ee12da9 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c | |||
| @@ -59,6 +59,7 @@ cond_syscall(sys_epoll_create); | |||
| 59 | cond_syscall(sys_epoll_ctl); | 59 | cond_syscall(sys_epoll_ctl); |
| 60 | cond_syscall(sys_epoll_wait); | 60 | cond_syscall(sys_epoll_wait); |
| 61 | cond_syscall(sys_epoll_pwait); | 61 | cond_syscall(sys_epoll_pwait); |
| 62 | cond_syscall(compat_sys_epoll_pwait); | ||
| 62 | cond_syscall(sys_semget); | 63 | cond_syscall(sys_semget); |
| 63 | cond_syscall(sys_semop); | 64 | cond_syscall(sys_semop); |
| 64 | cond_syscall(sys_semtimedop); | 65 | cond_syscall(sys_semtimedop); |