Commit 46bb3931 authored by Jesse Barnes's avatar Jesse Barnes Committed by Linus Torvalds

[PATCH] export sys_ioctl to modules

Small patch to export sys_ioctl if CONFIG_COMPAT is set.  This allows
platforms to implement 32 bit compatibility ioctl handlers in modules.
Submitted-by: default avatarJesse Barnes <jbarnes@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 09322980
...@@ -50,7 +50,6 @@ extern int do_signal(sigset_t *, struct pt_regs *); ...@@ -50,7 +50,6 @@ extern int do_signal(sigset_t *, struct pt_regs *);
int abs(int); int abs(int);
EXPORT_SYMBOL(do_signal); EXPORT_SYMBOL(do_signal);
EXPORT_SYMBOL(sys_ioctl);
EXPORT_SYMBOL(isa_io_base); EXPORT_SYMBOL(isa_io_base);
EXPORT_SYMBOL(pci_io_base); EXPORT_SYMBOL(pci_io_base);
......
...@@ -76,4 +76,3 @@ EXPORT_SYMBOL(console_device); ...@@ -76,4 +76,3 @@ EXPORT_SYMBOL(console_device);
EXPORT_SYMBOL_NOVERS(do_call_softirq); EXPORT_SYMBOL_NOVERS(do_call_softirq);
EXPORT_SYMBOL(sys_wait4); EXPORT_SYMBOL(sys_wait4);
EXPORT_SYMBOL(cpcmd); EXPORT_SYMBOL(cpcmd);
EXPORT_SYMBOL(sys_ioctl);
...@@ -327,7 +327,6 @@ EXPORT_SYMBOL(sys_getegid); ...@@ -327,7 +327,6 @@ EXPORT_SYMBOL(sys_getegid);
EXPORT_SYMBOL(sys_getgid); EXPORT_SYMBOL(sys_getgid);
EXPORT_SYMBOL(svr4_getcontext); EXPORT_SYMBOL(svr4_getcontext);
EXPORT_SYMBOL(svr4_setcontext); EXPORT_SYMBOL(svr4_setcontext);
EXPORT_SYMBOL(sys_ioctl);
EXPORT_SYMBOL(compat_sys_ioctl); EXPORT_SYMBOL(compat_sys_ioctl);
EXPORT_SYMBOL(sparc32_open); EXPORT_SYMBOL(sparc32_open);
EXPORT_SYMBOL(sys_close); EXPORT_SYMBOL(sys_close);
......
...@@ -218,4 +218,3 @@ EXPORT_SYMBOL(flush_tlb_page); ...@@ -218,4 +218,3 @@ EXPORT_SYMBOL(flush_tlb_page);
EXPORT_SYMBOL_GPL(flush_tlb_all); EXPORT_SYMBOL_GPL(flush_tlb_all);
#endif #endif
EXPORT_SYMBOL(sys_ioctl);
...@@ -4,11 +4,13 @@ ...@@ -4,11 +4,13 @@
* Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1991, 1992 Linus Torvalds
*/ */
#include <linux/config.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/security.h> #include <linux/security.h>
#include <linux/module.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/ioctls.h> #include <asm/ioctls.h>
...@@ -133,3 +135,11 @@ asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) ...@@ -133,3 +135,11 @@ asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
out: out:
return error; return error;
} }
/*
* Platforms implementing 32 bit compatibility ioctl handlers in
* modules need this exported
*/
#ifdef CONFIG_COMPAT
EXPORT_SYMBOL(sys_ioctl);
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment