Merge tag 'drm-psr-fixes-for-v4.8' of git://people.freedesktop.org/~airlied/linux

[deliverable/linux.git] / include / linux / capability.h

diff --git a/include/linux/capability.h b/include/linux/capability.h
index 00690ff92edfed99956b04947d2c09b9ebac580f..5f3c63dde2d5acb41077b879cf67758dd63a51e3 100644 (file)
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -206,6 +206,7 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
                                      struct user_namespace *ns, int cap);
 extern bool capable(int cap);
 extern bool ns_capable(struct user_namespace *ns, int cap);
+extern bool ns_capable_noaudit(struct user_namespace *ns, int cap);
 #else
 static inline bool has_capability(struct task_struct *t, int cap)
 {
@@ -233,6 +234,10 @@ static inline bool ns_capable(struct user_namespace *ns, int cap)
 {
        return true;
 }
+static inline bool ns_capable_noaudit(struct user_namespace *ns, int cap)
+{
+       return true;
+}
 #endif /* CONFIG_MULTIUSER */
 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);