diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-23 09:28:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-23 09:28:16 +1000 |
| commit | bd0fc224268c22a911b99909a438ff55c5979fb3 (patch) | |
| tree | 44ef43f4b3aecbf52878ec05db9ad03ce55fa60a /kernel/sys_ni.c | |
| parent | 6b201f40dad2a4edec53ef73578c402a4bef17ae (diff) | |
| parent | 44c852ead55b7450c8cff0dc90a3d48310300210 (diff) | |
Merge remote branch 'net-current/master'
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h
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); |