---

yaml --- r: 305982 b: refs/heads/master c: 7e6bd8f h: refs/heads/master v: v3
git-mirror · Apr 7, 2012 · d44e9a4 · d44e9a4
1 parent a74cf1f
commit d44e9a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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