diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 6 | ||||
| -rw-r--r-- | include/linux/security.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index db1774bca8c6..3cdfc8887b5c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -540,8 +540,10 @@ static inline int sas_ss_flags(unsigned long sp) } -#ifndef CONFIG_SECURITY -/* capable prototype and code are in security.[hc] if CONFIG_SECURITY */ +#ifdef CONFIG_SECURITY +/* code is in security.c */ +extern int capable(int cap); +#else static inline int capable(int cap) { if (cap_raised(current->cap_effective, cap)) { diff --git a/include/linux/security.h b/include/linux/security.h index efd997ae6b7d..a20a2b18fc3d 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1371,7 +1371,6 @@ extern int register_security (struct security_operations *ops); extern int unregister_security (struct security_operations *ops); extern int mod_reg_security (const char *name, struct security_operations *ops); extern int mod_unreg_security (const char *name, struct security_operations *ops); -extern int capable (int cap); #else /* CONFIG_SECURITY */ |