diff --git a/[refs] b/[refs]
index c12c383acc55..da26334ea269 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74ba508f60c3650595297b33a4cdfd02e443194e
+refs/heads/master: 7e6bd8fadd1216f50468f965d0308f45e5109ced
diff --git a/trunk/include/linux/cred.h b/trunk/include/linux/cred.h
index adadf71a7327..d12c4e475c15 100644
--- a/trunk/include/linux/cred.h
+++ b/trunk/include/linux/cred.h
@@ -357,11 +357,11 @@ static inline void put_cred(const struct cred *_cred)
 #define current_user()		(current_cred_xxx(user))
 #define current_security()	(current_cred_xxx(security))
 
+extern struct user_namespace init_user_ns;
 #ifdef CONFIG_USER_NS
 #define current_user_ns()	(current_cred_xxx(user_ns))
 #define task_user_ns(task)	(task_cred_xxx((task), user_ns))
 #else
-extern struct user_namespace init_user_ns;
 #define current_user_ns()	(&init_user_ns)
 #define task_user_ns(task)	(&init_user_ns)
 #endif