diff options
author | Christoph Hellwig <hch@lst.de> | 2005-04-16 18:25:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:48 -0400 |
commit | 22a685d09bb98810670ac0fb02c2138bdbf038cc (patch) | |
tree | dbd4fd3cdfdb5a7695d2d44f698cdd757b8c67eb /include/linux/ioctl32.h | |
parent | 6cae60feb6709dea4cb94da93d4d2ea039aee59d (diff) |
[PATCH] officially deprecate register_ioctl32_conversion
These have been deprecated since ->compat_ioctl when in, thus only a short
deprecation period. There's four users left: i2o_config, s390/z90crypy,
s390/dasd and s390/zfcp and for the first two patches are about to be
submitted to get rid of it.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/ioctl32.h')
-rw-r--r-- | include/linux/ioctl32.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/ioctl32.h b/include/linux/ioctl32.h index e1a641819428..e8c4af32b3bb 100644 --- a/include/linux/ioctl32.h +++ b/include/linux/ioctl32.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef IOCTL32_H | 1 | #ifndef IOCTL32_H |
2 | #define IOCTL32_H 1 | 2 | #define IOCTL32_H 1 |
3 | 3 | ||
4 | #include <linux/compiler.h> /* for __deprecated */ | ||
5 | |||
4 | struct file; | 6 | struct file; |
5 | 7 | ||
6 | typedef int (*ioctl_trans_handler_t)(unsigned int, unsigned int, | 8 | typedef int (*ioctl_trans_handler_t)(unsigned int, unsigned int, |
@@ -23,9 +25,9 @@ struct ioctl_trans { | |||
23 | */ | 25 | */ |
24 | 26 | ||
25 | #ifdef CONFIG_COMPAT | 27 | #ifdef CONFIG_COMPAT |
26 | extern int register_ioctl32_conversion(unsigned int cmd, | 28 | extern int __deprecated register_ioctl32_conversion(unsigned int cmd, |
27 | ioctl_trans_handler_t handler); | 29 | ioctl_trans_handler_t handler); |
28 | extern int unregister_ioctl32_conversion(unsigned int cmd); | 30 | extern int __deprecated unregister_ioctl32_conversion(unsigned int cmd); |
29 | 31 | ||
30 | #else | 32 | #else |
31 | 33 | ||