summaryrefslogtreecommitdiffstats
path: root/kernel/user.c
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-03-30 22:08:33 -0500
committerFelix Blyakher <felixb@sgi.com>2009-03-30 22:08:33 -0500
commit930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch)
treedf6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /kernel/user.c
parent8b112171734c791afaf43ccc8c6ec492e7006e44 (diff)
parent15f7176eb1cccec0a332541285ee752b935c1c85 (diff)
downloadkernel-crypto-930861c4e6f13ce2e7d06cd1ef11441a065517d9.tar.gz
kernel-crypto-930861c4e6f13ce2e7d06cd1ef11441a065517d9.tar.xz
kernel-crypto-930861c4e6f13ce2e7d06cd1ef11441a065517d9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/user.c')
-rw-r--r--kernel/user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/user.c b/kernel/user.c
index fbb300e6191..850e0ba41c1 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -20,7 +20,7 @@
struct user_namespace init_user_ns = {
.kref = {
- .refcount = ATOMIC_INIT(1),
+ .refcount = ATOMIC_INIT(2),
},
.creator = &root_user,
};