diff options
| author |   James Morris <james.l.morris@oracle.com> | 2016-03-04 11:39:53 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-03-04 11:39:53 +1100 |
| commit | 88a1b564a20e371e6be41b39b85673e9c1959491 (patch) | |
| tree | f70850f5242470d479711ddb816ac05f47b15642 /security/keys/big_key.c | |
| parent | Merge branch 'stable-4.6' of git://git.infradead.org/users/pcmoore/selinux into next (diff) | |
| parent | X.509: Make algo identifiers text instead of enum (diff) | |
| download | linux-dev-88a1b564a20e371e6be41b39b85673e9c1959491.tar.xz linux-dev-88a1b564a20e371e6be41b39b85673e9c1959491.zip | |
Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/big_key.c')
| -rw-r--r-- | security/keys/big_key.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/security/keys/big_key.c b/security/keys/big_key.c index 907c1522ee46..c721e398893a 100644 --- a/security/keys/big_key.c +++ b/security/keys/big_key.c @@ -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"); - /* * Layout of key payload words. */ @@ -212,18 +209,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); |