Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next

[deliverable/linux.git] / include / linux / cred.h

diff --git a/include/linux/cred.h b/include/linux/cred.h
index 8d70e1361ecd0ee01b4f11380623ada6a7751888..257db64562e54092adec7bc506b6db7325f86c3e 100644 (file)
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -377,7 +377,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