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

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