aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorRobin Holt <holt@sgi.com>2011-01-12 20:00:01 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:03:12 -0500
commit52bd19f7691b2ea6433aef0ef94c08c57efd7e79 (patch)
treedaaa39ee774fb4fe56ca61247eb930ed4f6e1ef1 /include/linux/sched.h
parent65329bf46bf9ddc37845c9a6823a8e8022d305b9 (diff)
epoll: convert max_user_watches to long
On a 16TB machine, max_user_watches has an integer overflow. Convert it to use a long and handle the associated fallout. Signed-off-by: Robin Holt <holt@sgi.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Davide Libenzi <davidel@xmailserver.org> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index abc527aa8550..96e23215e276 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -683,7 +683,7 @@ struct user_struct {
683 atomic_t fanotify_listeners; 683 atomic_t fanotify_listeners;
684#endif 684#endif
685#ifdef CONFIG_EPOLL 685#ifdef CONFIG_EPOLL
686 atomic_t epoll_watches; /* The number of file descriptors currently watched */ 686 atomic_long_t epoll_watches; /* The number of file descriptors currently watched */
687#endif 687#endif
688#ifdef CONFIG_POSIX_MQUEUE 688#ifdef CONFIG_POSIX_MQUEUE
689 /* protected by mq_lock */ 689 /* protected by mq_lock */