diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /kernel/user.c | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'kernel/user.c')
| -rw-r--r-- | kernel/user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/user.c b/kernel/user.c index fbb300e6191f..850e0ba41c1e 100644 --- a/kernel/user.c +++ b/kernel/user.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | struct user_namespace init_user_ns = { | 21 | struct user_namespace init_user_ns = { |
| 22 | .kref = { | 22 | .kref = { |
| 23 | .refcount = ATOMIC_INIT(1), | 23 | .refcount = ATOMIC_INIT(2), |
| 24 | }, | 24 | }, |
| 25 | .creator = &root_user, | 25 | .creator = &root_user, |
| 26 | }; | 26 | }; |