diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-12-09 21:36:30 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-12-12 23:58:50 +0100 |
| commit | a79860800e0b500902baf745c259625e48a403db (patch) | |
| tree | 02874a69058a4b2ae8bc98c9ff8a34b4e983f18e /security | |
| parent | security: integrity: make ima_main explicitly non-modular (diff) | |
| download | linux-a79860800e0b500902baf745c259625e48a403db.tar.xz linux-a79860800e0b500902baf745c259625e48a403db.zip | |
keys: remove needless modular infrastructure from ecryptfs_format
Even though the support can be modular, only one file needs to use
all the macros like MODULE_AUTHOR, MODULE_LICENSE etc. Only the one
responsible for registering/removal with module_init/module_exit
needs to declare these. In this case, that file is "encrypted.c"
and it already has the MODULE_LICENSE that we are removing here.
Since the file does EXPORT_SYMBOL, we add export.h - and build tests
show that module.h (which includes everything) was hiding an implicit
use of string.h - so that is added as well.
Cc: Mimi Zohar <zohar@linux.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: linux-integrity@vger.kernel.org
Cc: keyrings@vger.kernel.org
Cc: linux-security-module@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/encrypted-keys/ecryptfs_format.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/keys/encrypted-keys/ecryptfs_format.c b/security/keys/encrypted-keys/ecryptfs_format.c index 6daa3b6ff9ed..efac03047919 100644 --- a/security/keys/encrypted-keys/ecryptfs_format.c +++ b/security/keys/encrypted-keys/ecryptfs_format.c @@ -15,7 +15,8 @@ * the Free Software Foundation, version 2 of the License. */ -#include <linux/module.h> +#include <linux/export.h> +#include <linux/string.h> #include "ecryptfs_format.h" u8 *ecryptfs_get_auth_tok_key(struct ecryptfs_auth_tok *auth_tok) @@ -77,5 +78,3 @@ int ecryptfs_fill_auth_tok(struct ecryptfs_auth_tok *auth_tok, return 0; } EXPORT_SYMBOL(ecryptfs_fill_auth_tok); - -MODULE_LICENSE("GPL"); |