diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 09:07:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 09:07:19 +0100 |
| commit | b8307db2477f9c551e54e0c7b643ea349a3349cd (patch) | |
| tree | 88654f8bd73857bbd40f75013ce41d8882d16ce6 /include/linux/sched.h | |
| parent | f0461d0146ee30927bc7efa2ae24ea8c6693b725 (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
| download | talos-obmc-linux-b8307db2477f9c551e54e0c7b643ea349a3349cd.tar.gz talos-obmc-linux-b8307db2477f9c551e54e0c7b643ea349a3349cd.zip | |
Merge commit 'v2.6.28-rc7' into tracing/core
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 7ad48f2a2758..2d0a93c31228 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -631,6 +631,10 @@ struct user_struct { atomic_t inotify_watches; /* How many inotify watches does this user have? */ atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ #endif +#ifdef CONFIG_EPOLL + atomic_t epoll_devs; /* The number of epoll descriptors currently open */ + atomic_t epoll_watches; /* The number of file descriptors currently watched */ +#endif #ifdef CONFIG_POSIX_MQUEUE /* protected by mq_lock */ unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */ |
