security/keys: make big_key.c explicitly non-modular
Subsystems (2)
PATCH 1/1 security/keys: make big_key.c explicitly non-modular
The Kconfig currently controlling compilation of this code is:
config BIG_KEYS
bool "Large payload keys"
...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 module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit.
We also delete the MODULE_LICENSE tag since all that information is already contained at the top of the file in the comments.
Cc David Howells <[email protected]>
Cc James Morris <[email protected]>
Cc "Serge E. Hallyn" <[email protected]>
Signed-off-by Paul Gortmaker <[email protected]>
--- security/keys/big_key.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
security/keys/big_key.c +1 -14
@@ -9,7 +9,6 @@* 2 of the Licence, or (at your option) any later version. */ -#include <linux/module.h> #include <linux/init.h> #include <linux/seq_file.h> #include <linux/file.h>
@@ -18,8 +17,6 @@#include <keys/user-type.h> #include <keys/big_key-type.h> -MODULE_LICENSE ("GPL" ); -/* * If the data is under this limit, there's no point creating a shm file to * hold it as the permanently resident metadata for the shmem fs will be at
@@ -197,18 +194,8 @@ long big_key_read(const struct key *key, char __user *buffer, size_t buflen)return ret; } -/* -* Module stuff -*/ static int __init big_key_init (void ) {return register_key_type (&key_type_big_key); } - -static void __exit big_key_cleanup(void) -{ -unregister_key_type (&key_type_big_key); -} - -module_init (big_key_init); -module_exit (big_key_cleanup); +device_initcall (big_key_init);
Signature · 1 line
2.5.0