diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /fs/eventpoll.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'fs/eventpoll.c')
| -rw-r--r-- | fs/eventpoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 085c5c063420..366c503f9657 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
| @@ -251,10 +251,10 @@ ctl_table epoll_table[] = { | |||
| 251 | .data = &max_user_watches, | 251 | .data = &max_user_watches, |
| 252 | .maxlen = sizeof(int), | 252 | .maxlen = sizeof(int), |
| 253 | .mode = 0644, | 253 | .mode = 0644, |
| 254 | .proc_handler = &proc_dointvec_minmax, | 254 | .proc_handler = proc_dointvec_minmax, |
| 255 | .extra1 = &zero, | 255 | .extra1 = &zero, |
| 256 | }, | 256 | }, |
| 257 | { .ctl_name = 0 } | 257 | { } |
| 258 | }; | 258 | }; |
| 259 | #endif /* CONFIG_SYSCTL */ | 259 | #endif /* CONFIG_SYSCTL */ |
| 260 | 260 | ||