diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /include/net/compat.h | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'include/net/compat.h')
| -rw-r--r-- | include/net/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/compat.h b/include/net/compat.h index 164cb682e220..5bbf8bf9efea 100644 --- a/include/net/compat.h +++ b/include/net/compat.h | |||
| @@ -32,7 +32,7 @@ extern int compat_sock_get_timestampns(struct sock *, struct timespec __user *); | |||
| 32 | #endif /* defined(CONFIG_COMPAT) */ | 32 | #endif /* defined(CONFIG_COMPAT) */ |
| 33 | 33 | ||
| 34 | extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *); | 34 | extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *); |
| 35 | extern int verify_compat_iovec(struct msghdr *, struct iovec *, char *, int); | 35 | extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr *, int); |
| 36 | extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned); | 36 | extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned); |
| 37 | extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned); | 37 | extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned); |
| 38 | extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *); | 38 | extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *); |