diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /fs/binfmt_misc.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'fs/binfmt_misc.c')
| -rw-r--r-- | fs/binfmt_misc.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 7b9cead81..6143bd5d0 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -27,8 +27,8 @@ #include <linux/proc_fs.h> #include <linux/string.h> #include <linux/ctype.h> +#include <linux/spinlock.h> #include <asm/uaccess.h> -#include <asm/spinlock.h> /* * We should make this work with a "stub-only" /proc, @@ -64,11 +64,7 @@ static void entry_proc_cleanup(struct binfmt_entry *e); static int entry_proc_setup(struct binfmt_entry *e); static struct linux_binfmt misc_format = { -#ifndef MODULE - NULL, 0, load_misc_binary, NULL, NULL -#else - NULL, &__this_module, load_misc_binary, NULL, NULL -#endif + NULL, THIS_MODULE, load_misc_binary, NULL, NULL, 0 }; static struct proc_dir_entry *bm_dir = NULL; @@ -493,7 +489,7 @@ static void bm_modcount(struct inode *inode, int fill) } #endif -int __init init_misc_binfmt(void) +static int __init init_misc_binfmt(void) { int error = -ENOENT; struct proc_dir_entry *status = NULL, *reg; @@ -528,14 +524,7 @@ cleanup_bm: goto out; } -#ifdef MODULE -EXPORT_NO_SYMBOLS; -int init_module(void) -{ - return init_misc_binfmt(); -} - -void cleanup_module(void) +static void __exit exit_misc_binfmt(void) { unregister_binfmt(&misc_format); remove_proc_entry("register", bm_dir); @@ -543,5 +532,8 @@ void cleanup_module(void) clear_entries(); remove_proc_entry("sys/fs/binfmt_misc", NULL); } -#endif -#undef VERBOSE_STATUS + +EXPORT_NO_SYMBOLS; + +module_init(init_misc_binfmt) +module_exit(exit_misc_binfmt) |