Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / cred.h

diff --git a/include/linux/cred.h b/include/linux/cred.h
index 6c58dd7cb9ace20c8a30a429490cac03df022fcf..cd3fb73dc42159c3691c68734e1cc37a2ebdc743 100644 (file)
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -345,7 +345,10 @@ extern struct user_namespace init_user_ns;
 #ifdef CONFIG_USER_NS
 #define current_user_ns()      (current_cred_xxx(user_ns))
 #else
-#define current_user_ns()      (&init_user_ns)
+static inline struct user_namespace *current_user_ns(void)
+{
+       return &init_user_ns;
+}
 #endif