git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
include
/
linux
/
ioctl32.h
diff --git
a/include/linux/ioctl32.h
b/include/linux/ioctl32.h
index
e5bff65
..
e8c4af3
100644
(file)
--- a/
include/linux/ioctl32.h
+++ b/
include/linux/ioctl32.h
@@
-1,8
+1,19
@@
#ifndef IOCTL32_H
#define IOCTL32_H 1
#ifndef IOCTL32_H
#define IOCTL32_H 1
+#include <linux/compiler.h> /* for __deprecated */
+
struct file;
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;
+};
+
/*
* Register an 32bit ioctl translation handler for ioctl cmd.
*
/*
* Register an 32bit ioctl translation handler for ioctl cmd.
*
@@
-13,16
+24,16
@@
struct file;
* struct file *file: file descriptor pointer.
*/
* struct file *file: file descriptor pointer.
*/
-extern int register_ioctl32_conversion(unsigned int cmd, int (*handler)(unsigned int, unsigned int, unsigned long, struct file *));
+#ifdef CONFIG_COMPAT
+extern int __deprecated register_ioctl32_conversion(unsigned int cmd,
+ ioctl_trans_handler_t handler);
+extern int __deprecated unregister_ioctl32_conversion(unsigned int cmd);
-extern int unregister_ioctl32_conversion(unsigned int cmd);
+#else
-typedef int (*ioctl_trans_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);
+#define register_ioctl32_conversion(cmd, handler) ({ 0; })
+#define unregister_ioctl32_conversion(cmd) ({ 0; })
-struct ioctl_trans {
- unsigned long cmd;
- ioctl_trans_handler_t handler;
- struct ioctl_trans *next;
-};
+#endif
#endif
#endif