diff options
| author | Tejun Heo <tj@kernel.org> | 2015-11-03 17:29:03 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-11-03 17:29:03 -0500 |
| commit | 159b5bb46492e4dcef2070b12861030bc360402b (patch) | |
| tree | 93de7d6e94a059aade50ee5437de6a50ccd1cf7b /include/linux/lsm_hooks.h | |
| parent | 56e74338a535cbcc2f2da08b1ea1a92920194364 (diff) | |
| parent | 469eabb3aec03d9defed3462df743a223a5c8f54 (diff) | |
Merge branch 'for-4.3-fixes' into for-4.4
Diffstat (limited to 'include/linux/lsm_hooks.h')
| -rw-r--r-- | include/linux/lsm_hooks.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 9429f054c323..ec3a6bab29de 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h | |||
| @@ -1881,8 +1881,10 @@ static inline void security_delete_hooks(struct security_hook_list *hooks, | |||
| 1881 | 1881 | ||
| 1882 | extern int __init security_module_enable(const char *module); | 1882 | extern int __init security_module_enable(const char *module); |
| 1883 | extern void __init capability_add_hooks(void); | 1883 | extern void __init capability_add_hooks(void); |
| 1884 | #ifdef CONFIG_SECURITY_YAMA_STACKED | 1884 | #ifdef CONFIG_SECURITY_YAMA |
| 1885 | void __init yama_add_hooks(void); | 1885 | extern void __init yama_add_hooks(void); |
| 1886 | #else | ||
| 1887 | static inline void __init yama_add_hooks(void) { } | ||
| 1886 | #endif | 1888 | #endif |
| 1887 | 1889 | ||
| 1888 | #endif /* ! __LINUX_LSM_HOOKS_H */ | 1890 | #endif /* ! __LINUX_LSM_HOOKS_H */ |