From: Christoph Hellwig Date: Sat, 16 Apr 2005 22:25:48 +0000 (-0700) Subject: [PATCH] officially deprecate register_ioctl32_conversion X-Git-Tag: v2.6.12-rc3~111 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22a685d09bb98810670ac0fb02c2138bdbf038cc;p=linux-2.6 [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 Signed-off-by: Linus Torvalds --- diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index b6b1f5ab53..56627c1546 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 + +--------------------------- + +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 , Christoph Hellwig diff --git a/include/linux/ioctl32.h b/include/linux/ioctl32.h index e1a6418194..e8c4af32b3 100644 --- a/include/linux/ioctl32.h +++ b/include/linux/ioctl32.h @@ -1,6 +1,8 @@ #ifndef IOCTL32_H #define IOCTL32_H 1 +#include /* 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