diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 13:28:56 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 13:28:56 +0200 |
commit | b6a4b7de4cb45ccf7157fc58de09c96f84d67108 (patch) | |
tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /kernel/sys_ni.c | |
parent | 2778d0d51dd5007c4909c1d9874f5e9097785a7a (diff) | |
parent | 651dab4264e4ba0e563f5ff56f748127246e9065 (diff) | |
download | op-kernel-dev-b6a4b7de4cb45ccf7157fc58de09c96f84d67108.zip op-kernel-dev-b6a4b7de4cb45ccf7157fc58de09c96f84d67108.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers
Diffstat (limited to 'kernel/sys_ni.c')
-rw-r--r-- | kernel/sys_ni.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 08d6e1b..a77b27b 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -125,6 +125,12 @@ cond_syscall(sys_vm86old); cond_syscall(sys_vm86); cond_syscall(compat_sys_ipc); cond_syscall(compat_sys_sysctl); +cond_syscall(sys_flock); +cond_syscall(sys_io_setup); +cond_syscall(sys_io_destroy); +cond_syscall(sys_io_submit); +cond_syscall(sys_io_cancel); +cond_syscall(sys_io_getevents); /* arch-specific weak syscall entries */ cond_syscall(sys_pciconfig_read); |