diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-08-26 20:32:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-26 20:32:29 -0700 |
| commit | b04f69c9020dd07efce81eac79b2ed4f6b9d8bb5 (patch) | |
| tree | a4f55ea55511c67847e64e087b6b70336e98e445 /include | |
| parent | 94ebcd446a9e9d20a0cb15f9c5f35df0736b084c (diff) | |
[PATCH] [un]register_ioctl32_conversion() stubs
The megaraid driver is calling these, but they don't exist if !CONFIG_COMPAT.
Add the necessary stubs, and clean a few things up.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ioctl32.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/include/linux/ioctl32.h b/include/linux/ioctl32.h index e5bff65d3074..e1a641819428 100644 --- a/include/linux/ioctl32.h +++ b/include/linux/ioctl32.h @@ -3,6 +3,15 @@ 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. * @@ -13,16 +22,16 @@ struct file; * 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 register_ioctl32_conversion(unsigned int cmd, + ioctl_trans_handler_t handler); extern int unregister_ioctl32_conversion(unsigned int cmd); -typedef int (*ioctl_trans_handler_t)(unsigned int, unsigned int, unsigned long, struct file *); +#else -struct ioctl_trans { - unsigned long cmd; - ioctl_trans_handler_t handler; - struct ioctl_trans *next; -}; +#define register_ioctl32_conversion(cmd, handler) ({ 0; }) +#define unregister_ioctl32_conversion(cmd) ({ 0; }) + +#endif #endif |