aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-12 04:29:35 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-12 04:29:35 -0500
commitc1dfdc7597d051b09555d4ae2acb90403e238746 (patch)
tree86aa49f5a2ab25459f9196dd6724bbe6645b1375 /include/linux/sched.h
parentefbe027e95dc13ac343b6130948418d7ead7ddf1 (diff)
parent8b1fae4e4200388b64dd88065639413cb3f1051c (diff)
Merge commit 'v2.6.28-rc8' into sched/core
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index d8733f07d80b..8cccd6dc5d66 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -628,6 +628,10 @@ struct user_struct {
628 atomic_t inotify_watches; /* How many inotify watches does this user have? */ 628 atomic_t inotify_watches; /* How many inotify watches does this user have? */
629 atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ 629 atomic_t inotify_devs; /* How many inotify devs does this user have opened? */
630#endif 630#endif
631#ifdef CONFIG_EPOLL
632 atomic_t epoll_devs; /* The number of epoll descriptors currently open */
633 atomic_t epoll_watches; /* The number of file descriptors currently watched */
634#endif
631#ifdef CONFIG_POSIX_MQUEUE 635#ifdef CONFIG_POSIX_MQUEUE
632 /* protected by mq_lock */ 636 /* protected by mq_lock */
633 unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */ 637 unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */