CHROMIUM: Yama: fix inline function declarations

This fixes some typos in the Yama function declaration portion of
security.h, allowing the tree to build without Yama enabled.

BUG=chromium-os:24552
TEST=x86-alex build without CONFIG_SECURITY_YAMA
STATUS=Fixed

Change-Id: I37bd31e1925f41db6fd897126aff2054bcd59227
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/13471
Reviewed-by: Olof Johansson <olofj@chromium.org>

diff --git a/include/linux/security.h b/include/linux/security.h
index 4acf709..4efe351 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -3021,7 +3021,7 @@ static inline void free_secdata(void *secdata)
 { }
 #endif /* CONFIG_SECURITY */
 
-#if CONFIG_SECURITY_YAMA
+#ifdef CONFIG_SECURITY_YAMA
 extern int yama_ptrace_access_check(struct task_struct *child,
                                    unsigned int mode);
 extern int yama_path_link(struct dentry *old_dentry, struct path *new_dir,
@@ -3033,25 +3033,25 @@ extern int yama_task_prctl(int option, unsigned long arg2, unsigned long arg3,
                           unsigned long arg4, unsigned long arg5);
 #else
 static inline int yama_ptrace_access_check(struct task_struct *child,
-                                          unsigned int mode);
+                                          unsigned int mode)
 {
        return 0;
 }
 
 static inline int yama_path_link(struct dentry *old_dentry,
                                 struct path *new_dir,
-                                struct dentry *new_dentry);
+                                struct dentry *new_dentry)
 {
        return 0;
 }
 
 static inline int yama_inode_follow_link(struct dentry *dentry,
-                                        struct nameidata *nameidata);
+                                        struct nameidata *nameidata)
 {
        return 0;
 }
 
-static inline void yama_task_free(struct task_struct *task);
+static inline void yama_task_free(struct task_struct *task)
 {
 }