diff options
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 659071c2e57c..5f7441abbf42 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -189,9 +189,9 @@ static inline const char *kernel_load_data_id_str(enum kernel_load_data_id id) | |||
189 | 189 | ||
190 | #ifdef CONFIG_SECURITY | 190 | #ifdef CONFIG_SECURITY |
191 | 191 | ||
192 | int call_lsm_notifier(enum lsm_event event, void *data); | 192 | int call_blocking_lsm_notifier(enum lsm_event event, void *data); |
193 | int register_lsm_notifier(struct notifier_block *nb); | 193 | int register_blocking_lsm_notifier(struct notifier_block *nb); |
194 | int unregister_lsm_notifier(struct notifier_block *nb); | 194 | int unregister_blocking_lsm_notifier(struct notifier_block *nb); |
195 | 195 | ||
196 | /* prototypes */ | 196 | /* prototypes */ |
197 | extern int security_init(void); | 197 | extern int security_init(void); |
@@ -394,17 +394,17 @@ int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen); | |||
394 | int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); | 394 | int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); |
395 | #else /* CONFIG_SECURITY */ | 395 | #else /* CONFIG_SECURITY */ |
396 | 396 | ||
397 | static inline int call_lsm_notifier(enum lsm_event event, void *data) | 397 | static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) |
398 | { | 398 | { |
399 | return 0; | 399 | return 0; |
400 | } | 400 | } |
401 | 401 | ||
402 | static inline int register_lsm_notifier(struct notifier_block *nb) | 402 | static inline int register_blocking_lsm_notifier(struct notifier_block *nb) |
403 | { | 403 | { |
404 | return 0; | 404 | return 0; |
405 | } | 405 | } |
406 | 406 | ||
407 | static inline int unregister_lsm_notifier(struct notifier_block *nb) | 407 | static inline int unregister_blocking_lsm_notifier(struct notifier_block *nb) |
408 | { | 408 | { |
409 | return 0; | 409 | return 0; |
410 | } | 410 | } |