diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-06 15:02:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-06 15:02:34 +0200 |
| commit | d9b2002c406011164f245de7a81304625989f1c9 (patch) | |
| tree | a2bb74773cd1409acbec5eb2fbba2ae9889d55e8 /kernel/sys_ni.c | |
| parent | c3b32fcbc7f4fd9a9b84718b991b175b0fd53f8c (diff) | |
| parent | 906010b2134e14a2e377decbadd357b3d0ab9c6a (diff) | |
| download | linux-d9b2002c406011164f245de7a81304625989f1c9.tar.gz linux-d9b2002c406011164f245de7a81304625989f1c9.tar.bz2 linux-d9b2002c406011164f245de7a81304625989f1c9.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 515bc230ac2a..e06d0b8d1951 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -49,6 +49,7 @@ cond_syscall(sys_sendmsg); cond_syscall(compat_sys_sendmsg); cond_syscall(sys_recvmsg); cond_syscall(compat_sys_recvmsg); +cond_syscall(compat_sys_recvfrom); cond_syscall(sys_socketcall); cond_syscall(sys_futex); cond_syscall(compat_sys_futex); |