diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-27 12:04:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-27 12:04:52 -0800 |
| commit | 3f03bf93947fa2a2b84fac56e93c65d4fffed7f1 (patch) | |
| tree | 57c8b97e28aa835a97a46edee817e7c07ec2a63f /security/integrity/ima/ima_appraise.c | |
| parent | fb2a624d5fe8b9206d14bff52da7a368a3a8374c (diff) | |
| parent | b49d564344f773d8afee982153c8493e5f2eaf38 (diff) | |
| download | lwn-3f03bf93947fa2a2b84fac56e93c65d4fffed7f1.tar.gz lwn-3f03bf93947fa2a2b84fac56e93c65d4fffed7f1.zip | |
Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull general security subsystem updates from James Morris:
"The main changes here are Paul Gortmaker's removal of unneccesary
module.h infrastructure"
* 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
security: integrity: partial revert of make ima_main explicitly non-modular
security: fs: make inode explicitly non-modular
security: audit and remove any unnecessary uses of module.h
security: integrity: make evm_main explicitly non-modular
keys: remove needless modular infrastructure from ecryptfs_format
security: integrity: make ima_main explicitly non-modular
tomoyo: fix small typo
Diffstat (limited to 'security/integrity/ima/ima_appraise.c')
| -rw-r--r-- | security/integrity/ima/ima_appraise.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index deec1804a00a..2e11e750a067 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -8,7 +8,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 2 of the License. */ -#include <linux/module.h> +#include <linux/init.h> #include <linux/file.h> #include <linux/fs.h> #include <linux/xattr.h> |