diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /arch/ia64/ia32/sys_ia32.c | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'arch/ia64/ia32/sys_ia32.c')
| -rw-r--r-- | arch/ia64/ia32/sys_ia32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index 247a21c64aea..c1e20d65dd6c 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c | |||
| @@ -2427,7 +2427,7 @@ sys32_epoll_wait(int epfd, struct epoll_event32 __user * events, int maxevents, | |||
| 2427 | { | 2427 | { |
| 2428 | struct epoll_event *events64 = NULL; | 2428 | struct epoll_event *events64 = NULL; |
| 2429 | mm_segment_t old_fs = get_fs(); | 2429 | mm_segment_t old_fs = get_fs(); |
| 2430 | int error, numevents, size; | 2430 | int numevents, size; |
| 2431 | int evt_idx; | 2431 | int evt_idx; |
| 2432 | int do_free_pages = 0; | 2432 | int do_free_pages = 0; |
| 2433 | 2433 | ||