diff options
| author | Christoph Hellwig <hch@lst.de> | 2005-04-16 15:25:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:48 -0700 |
| commit | 22a685d09bb98810670ac0fb02c2138bdbf038cc (patch) | |
| tree | dbd4fd3cdfdb5a7695d2d44f698cdd757b8c67eb | |
| 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>
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 | ||||
| -rw-r--r-- | include/linux/ioctl32.h | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index b6b1f5ab535..56627c1546d 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -40,3 +40,11 @@ Why: Replaced by io_remap_pfn_range() which allows more memory space addressabilty (by using a pfn) and supports sparc & sparc64 iospace as part of the pfn. Who: Randy Dunlap <rddunlap@osdl.org> + +--------------------------- + +What: register_ioctl32_conversion() / unregister_ioctl32_conversion() +When: April 2005 +Why: Replaced by ->compat_ioctl in file_operations and other method + vecors. +Who: Andi Kleen <ak@muc.de>, Christoph Hellwig <hch@lst.de> diff --git a/include/linux/ioctl32.h b/include/linux/ioctl32.h index e1a64181942..e8c4af32b3b 100644 --- a/include/linux/ioctl32.h +++ b/include/linux/ioctl32.h @@ -1,6 +1,8 @@ #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, @@ -23,9 +25,9 @@ struct ioctl_trans { */ #ifdef CONFIG_COMPAT -extern int register_ioctl32_conversion(unsigned int cmd, +extern int __deprecated register_ioctl32_conversion(unsigned int cmd, ioctl_trans_handler_t handler); -extern int unregister_ioctl32_conversion(unsigned int cmd); +extern int __deprecated unregister_ioctl32_conversion(unsigned int cmd); #else |