diff --git a/[refs] b/[refs] index 430e79b830b9..7b1aa60527d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c1488fd581a447ec87c4b59f0d33f95f0aa441b +refs/heads/master: 945af7c3289c26c9070d6b1bf3ca759d36643e0b diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h index 97de3fe3dd0d..f4eb32d5b890 100644 --- a/trunk/include/linux/security.h +++ b/trunk/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) { }