diff options
author | Alexey Dobriyan <adobriyan@sw.ru> | 2007-10-17 02:30:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:59 -0400 |
commit | 970a8645ca051225a32401e4c80b50fc0a49c081 (patch) | |
tree | 25600770b729500354d025f078d0ce9f655bdea4 /kernel/user.c | |
parent | 40aeb400f68090f92010920ddf284b672a1461b8 (diff) |
user.c: #ifdef ->mq_bytes
For those who deselect POSIX message queues.
Reduces SLAB size of user_struct from 64 to 32 bytes here, SLUB size -- from
40 bytes to 32 bytes.
[akpm@linux-foundation.org: fix build]
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/user.c')
-rw-r--r-- | kernel/user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/user.c b/kernel/user.c index f42a68e008fd..9cb6f6403561 100644 --- a/kernel/user.c +++ b/kernel/user.c | |||
@@ -44,7 +44,6 @@ struct user_struct root_user = { | |||
44 | .processes = ATOMIC_INIT(1), | 44 | .processes = ATOMIC_INIT(1), |
45 | .files = ATOMIC_INIT(0), | 45 | .files = ATOMIC_INIT(0), |
46 | .sigpending = ATOMIC_INIT(0), | 46 | .sigpending = ATOMIC_INIT(0), |
47 | .mq_bytes = 0, | ||
48 | .locked_shm = 0, | 47 | .locked_shm = 0, |
49 | #ifdef CONFIG_KEYS | 48 | #ifdef CONFIG_KEYS |
50 | .uid_keyring = &root_user_keyring, | 49 | .uid_keyring = &root_user_keyring, |
@@ -341,8 +340,9 @@ struct user_struct * alloc_uid(struct user_namespace *ns, uid_t uid) | |||
341 | atomic_set(&new->inotify_watches, 0); | 340 | atomic_set(&new->inotify_watches, 0); |
342 | atomic_set(&new->inotify_devs, 0); | 341 | atomic_set(&new->inotify_devs, 0); |
343 | #endif | 342 | #endif |
344 | 343 | #ifdef CONFIG_POSIX_MQUEUE | |
345 | new->mq_bytes = 0; | 344 | new->mq_bytes = 0; |
345 | #endif | ||
346 | new->locked_shm = 0; | 346 | new->locked_shm = 0; |
347 | 347 | ||
348 | if (alloc_uid_keyring(new, current) < 0) { | 348 | if (alloc_uid_keyring(new, current) < 0) { |