diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:09:18 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:09:18 -0400 |
| commit | 68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea (patch) | |
| tree | 69d855c2e46d42ef8f23680cf3a1e6ff38de9ef4 /kernel/user.c | |
| parent | 88fd449e734a4264347e12b8ff74ccb33a9b9a35 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
Diffstat (limited to 'kernel/user.c')
| -rw-r--r-- | kernel/user.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/user.c b/kernel/user.c index b815fefbe76f..750acffbe9ec 100644 --- a/kernel/user.c +++ b/kernel/user.c | |||
| @@ -38,6 +38,14 @@ struct user_namespace init_user_ns = { | |||
| 38 | .count = 4294967295U, | 38 | .count = 4294967295U, |
| 39 | }, | 39 | }, |
| 40 | }, | 40 | }, |
| 41 | .projid_map = { | ||
| 42 | .nr_extents = 1, | ||
| 43 | .extent[0] = { | ||
| 44 | .first = 0, | ||
| 45 | .lower_first = 0, | ||
| 46 | .count = 4294967295U, | ||
| 47 | }, | ||
| 48 | }, | ||
| 41 | .kref = { | 49 | .kref = { |
| 42 | .refcount = ATOMIC_INIT(3), | 50 | .refcount = ATOMIC_INIT(3), |
| 43 | }, | 51 | }, |