diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-08-07 11:53:49 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-12-17 12:11:19 -0500 |
| commit | 7763d3b42ca62dc967cc56218df8007401e63cd0 (patch) | |
| tree | fe8f0bbb73647c398fdbebc578946fd8be099807 | |
| parent | 919b2040e53bd7885ea1c3b6a13a1075797c8adf (diff) | |
| download | linux-fs_initcall.tar.gz | |
fs: make binfmt_elf.c explicitly non-modularfs_initcall
The Kconfig currently controlling compilation of this code is:
config BINFMT_ELF
bool "Kernel support for ELF binaries"
...meaning that it currently is not being built as a module by anyone.
Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.
Since this file was already using core_initcall and not module_init,
we have no changes in initcall ordering with this commit.
We don't replace module.h with init.h since the file already has that.
We delete the MODULE_LICENSE tag and capture that information at the
top of the file alongside author comments, etc.
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | fs/binfmt_elf.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 3a93755e880fee..c26450ffbdc9c7 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -7,9 +7,9 @@ * Tools". * * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). + * License: GPL */ -#include <linux/module.h> #include <linux/kernel.h> #include <linux/fs.h> #include <linux/mm.h> @@ -2324,13 +2324,4 @@ static int __init init_elf_binfmt(void) register_binfmt(&elf_format); return 0; } - -static void __exit exit_elf_binfmt(void) -{ - /* Remove the COFF and ELF loaders. */ - unregister_binfmt(&elf_format); -} - core_initcall(init_elf_binfmt); -module_exit(exit_elf_binfmt); -MODULE_LICENSE("GPL"); |