Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

[firefly-linux-kernel-4.4.55.git] / include / linux / cred.h

diff --git a/include/linux/cred.h b/include/linux/cred.h
index 4aaeab3764469961f1106d988e57e58a91e1a16e..9aeeb0ba200363909bfd52a5a59f11cee7c54f5c 100644 (file)
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -354,9 +354,11 @@ static inline void put_cred(const struct cred *_cred)
 #define current_fsgid()        (current_cred_xxx(fsgid))
 #define current_cap()          (current_cred_xxx(cap_effective))
 #define current_user()         (current_cred_xxx(user))
-#define current_user_ns()      (current_cred_xxx(user)->user_ns)
+#define _current_user_ns()     (current_cred_xxx(user)->user_ns)
 #define current_security()     (current_cred_xxx(security))
 
+extern struct user_namespace *current_user_ns(void);
+
 #define current_uid_gid(_uid, _gid)            \
 do {                                           \
        const struct cred *__cred;              \