From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 28 Sep 2012 00:18:52 +0000 (+1000)
Subject: audith-replace-defines-with-c-stubs-fix
X-Git-Tag: next-20121005~1^2~395
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2de67d42da0403d5292c153916289867accdcc71;p=karo-tx-linux.git

audith-replace-defines-with-c-stubs-fix

Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 25ea7218f7b2..30e9beaf0cc1 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -530,7 +530,7 @@ extern int auditsc_get_stamp(struct audit_context *ctx,
 			      struct timespec *t, unsigned int *serial);
 extern int audit_set_loginuid(kuid_t loginuid);
 
-static inline int audit_get_loginuid(struct task_struct *tsk)
+static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
 {
 	return tsk->loginuid;
 }
@@ -677,7 +677,7 @@ static inline int auditsc_get_stamp(struct audit_context *ctx,
 {
 	return 0;
 }
-static inline int audit_get_loginuid(struct task_struct *tsk)
+static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
 {
 	return INVALID_UID;
 }