diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 22:42:55 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 22:42:55 (GMT) |
| commit | 6a8436419d1b77b24d82bd90354adc4baa393566 (patch) | |
| tree | d20e17b148f37dc299658a60303e6a2e4e6ce63f /include/linux/sched.h | |
| parent | 55fa518867978e1f5fd8353098f80d125ac734d7 (diff) | |
| parent | ff75427a7f641c4468610fbda2ccb69218174cd1 (diff) | |
| download | linux-fsl-qoriq-6a8436419d1b77b24d82bd90354adc4baa393566.tar.xz | |
Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
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 644ffbd..55e30d1 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -630,6 +630,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? */ |