diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-21 08:57:04 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-21 08:57:04 +0100 |
commit | fc02e90c34bacd5d7bc77b832c65a8f06e1bd60e (patch) | |
tree | d870acafa2290779aa7c0594172bf1c691d3e6c0 /kernel/sys_ni.c | |
parent | sched: fix inconsistency when redistribute per-cpu tg->cfs_rq shares (diff) | |
parent | Linux 2.6.28-rc6 (diff) | |
download | linux-fc02e90c34bacd5d7bc77b832c65a8f06e1bd60e.tar.xz linux-fc02e90c34bacd5d7bc77b832c65a8f06e1bd60e.zip |
Merge commit 'v2.6.28-rc6' into sched/core
Diffstat (limited to 'kernel/sys_ni.c')
-rw-r--r-- | kernel/sys_ni.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index a77b27b11b04..e14a23281707 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -31,7 +31,7 @@ cond_syscall(sys_socketpair); cond_syscall(sys_bind); cond_syscall(sys_listen); cond_syscall(sys_accept); -cond_syscall(sys_paccept); +cond_syscall(sys_accept4); cond_syscall(sys_connect); cond_syscall(sys_getsockname); cond_syscall(sys_getpeername); |