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_em86.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'fs/binfmt_em86.c')
| -rw-r--r-- | fs/binfmt_em86.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c index f102f2dec..aa2deaf6e 100644 --- a/fs/binfmt_em86.c +++ b/fs/binfmt_em86.c @@ -105,25 +105,18 @@ static int load_em86(struct linux_binprm *bprm,struct pt_regs *regs) } struct linux_binfmt em86_format = { -#ifndef MODULE - NULL, 0, load_em86, NULL, NULL -#else - NULL, &__this_module, load_em86, NULL, NULL -#endif + NULL, THIS_MODULE, load_em86, NULL, NULL, 0 }; -int __init init_em86_binfmt(void) +static int __init init_em86_binfmt(void) { return register_binfmt(&em86_format); } -#ifdef MODULE -int init_module(void) +static void __exit exit_em86_binfmt(void) { - return init_em86_binfmt(); -} - -void cleanup_module( void) { unregister_binfmt(&em86_format); } -#endif + +module_init(init_em86_binfmt) +module_exit(exit_em86_binfmt) |