Merge commit 'v2.6.28-rc8' into sched/core

2008-12-12 10:29:35 +01:00
parent efbe027e95 8b1fae4e42
commit c1dfdc7597
364 changed files with 5596 additions and 3235 deletions
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -628,6 +628,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? */