Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 22a685d09bb98810670ac0fb02c2138bdbf038cc

Authored by Christoph Hellwig
Committed by Linus Torvalds
1 parent 6cae60feb6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 2 changed files with 12 additions and 2 deletions Side-by-side Diff

Documentation/feature-removal-schedule.txt
Diff comments   View file @ 22a685d
... ... @@ -40,4 +40,12 @@
40 40 addressabilty (by using a pfn) and supports sparc & sparc64
41 41 iospace as part of the pfn.
42 42 Who: Randy Dunlap <rddunlap@osdl.org>
  43 +
  44 +---------------------------
  45 +
  46 +What: register_ioctl32_conversion() / unregister_ioctl32_conversion()
  47 +When: April 2005
  48 +Why: Replaced by ->compat_ioctl in file_operations and other method
  49 + vecors.
  50 +Who: Andi Kleen <ak@muc.de>, Christoph Hellwig <hch@lst.de>
include/linux/ioctl32.h
Diff comments   View file @ 22a685d
1 1 #ifndef IOCTL32_H
2 2 #define IOCTL32_H 1
3 3  
  4 +#include <linux/compiler.h> /* for __deprecated */
  5 +
4 6 struct file;
5 7  
6 8 typedef int (*ioctl_trans_handler_t)(unsigned int, unsigned int,
7 9  
... ... @@ -23,9 +25,9 @@
23 25 */
24 26  
25 27 #ifdef CONFIG_COMPAT
26   -extern int register_ioctl32_conversion(unsigned int cmd,
  28 +extern int __deprecated register_ioctl32_conversion(unsigned int cmd,
27 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 32 #else
31 33