aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2009-09-04 09:19:48 +0100
committerJames Morris <jmorris@namei.org>2009-09-07 11:39:10 +1000
commit945af7c3289c26c9070d6b1bf3ca759d36643e0b (patch)
treecc92de729237da13cf1bf344231ccf619a38d5a3
parent6c1488fd581a447ec87c4b59f0d33f95f0aa441b (diff)
downloadkernel_samsung_tuna-945af7c3289c26c9070d6b1bf3ca759d36643e0b.zip
kernel_samsung_tuna-945af7c3289c26c9070d6b1bf3ca759d36643e0b.tar.gz
kernel_samsung_tuna-945af7c3289c26c9070d6b1bf3ca759d36643e0b.tar.bz2
KEYS: security_cred_alloc_blank() should return int under all circumstances
Make security_cred_alloc_blank() return int, not void, when CONFIG_SECURITY=n. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--include/linux/security.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 97de3fe..f4eb32d 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -2309,8 +2309,10 @@ static inline int security_task_create(unsigned long clone_flags)
return 0;
}
-static inline void security_cred_alloc_blank(struct cred *cred, gfp_t gfp)
-{ }
+static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp)
+{
+ return 0;
+}
static inline void security_cred_free(struct cred *cred)
{ }