diff options
| author | Christoph Hellwig <hch@lst.de> | 2007-05-08 00:29:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:09 -0700 |
| commit | 6272e2667965dfb5b59199f462cd0f001fb304a6 (patch) | |
| tree | a14a4537dcd7af09863cc3a1c19a3efe386d67ab /include | |
| parent | 039b6b3ed84e45a6f8316358dd2bfdc83d59fc45 (diff) | |
| download | op-kernel-dev-6272e2667965dfb5b59199f462cd0f001fb304a6.zip op-kernel-dev-6272e2667965dfb5b59199f462cd0f001fb304a6.tar.gz | |
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')
| -rw-r--r-- | include/linux/ioctl32.h | 17 | ||||
| -rw-r--r-- | include/net/sock.h | 9 |
2 files changed, 0 insertions, 26 deletions
diff --git a/include/linux/ioctl32.h b/include/linux/ioctl32.h deleted file mode 100644 index 948809d..0000000 --- a/include/linux/ioctl32.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef IOCTL32_H -#define IOCTL32_H 1 - -#include <linux/compiler.h> /* for __deprecated */ - -struct file; - -typedef int (*ioctl_trans_handler_t)(unsigned int, unsigned int, - unsigned long, struct file *); - -struct ioctl_trans { - unsigned long cmd; - ioctl_trans_handler_t handler; - struct ioctl_trans *next; -}; - -#endif diff --git a/include/net/sock.h b/include/net/sock.h index 25c37e3..689b886 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) extern __u32 sysctl_wmem_max; extern __u32 sysctl_rmem_max; -#ifdef CONFIG_NET -int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg); -#else -static inline int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) -{ - return -ENODEV; -} -#endif - extern void sk_init(void); #ifdef CONFIG_SYSCTL |
