DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'v2.6.28-rc7' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar
2008-12-04 09:07:19 +01:00
parent f0461d0146 061e41fdb5
commit b8307db247
278 changed files with 5436 additions and 2575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/sched.h
View File

@@ -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? */