diff options
author | Christoph Hellwig <hch@lst.de> | 2007-05-08 03:29:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:09 -0400 |
commit | 6272e2667965dfb5b59199f462cd0f001fb304a6 (patch) | |
tree | a14a4537dcd7af09863cc3a1c19a3efe386d67ab /include/net | |
parent | 039b6b3ed84e45a6f8316358dd2bfdc83d59fc45 (diff) |
cleanup compat ioctl handling
Merge all compat ioctl handling into compat_ioctl.c instead of splitting it
over compat.c and compat_ioctl.c. This also allows to get rid of ioctl32.h
Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks-good-to: Andi Kleen <ak@suse.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/sock.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 25c37e34bfdc..689b886038da 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1361,15 +1361,6 @@ static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool) | |||
1361 | extern __u32 sysctl_wmem_max; | 1361 | extern __u32 sysctl_wmem_max; |
1362 | extern __u32 sysctl_rmem_max; | 1362 | extern __u32 sysctl_rmem_max; |
1363 | 1363 | ||
1364 | #ifdef CONFIG_NET | ||
1365 | int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg); | ||
1366 | #else | ||
1367 | static inline int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) | ||
1368 | { | ||
1369 | return -ENODEV; | ||
1370 | } | ||
1371 | #endif | ||
1372 | |||
1373 | extern void sk_init(void); | 1364 | extern void sk_init(void); |
1374 | 1365 | ||
1375 | #ifdef CONFIG_SYSCTL | 1366 | #ifdef CONFIG_SYSCTL |