diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-14 00:16:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-14 00:16:56 -0400 |
| commit | fc8e1ead9314cf0e0f1922e661428b93d3a50d88 (patch) | |
| tree | f3cb97c4769b74f6627a59769f1ed5c92a13c58a /arch/x86/ia32 | |
| parent | 2bcaa6a4238094c5695d5b1943078388d82d3004 (diff) | |
| parent | 9de48cc300fb10f7d9faa978670becf5e352462a (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/x86/ia32')
| -rw-r--r-- | arch/x86/ia32/ia32entry.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index a505202086e8..e590261ba059 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
| @@ -825,9 +825,11 @@ ia32_sys_call_table: | |||
| 825 | .quad compat_sys_signalfd4 | 825 | .quad compat_sys_signalfd4 |
| 826 | .quad sys_eventfd2 | 826 | .quad sys_eventfd2 |
| 827 | .quad sys_epoll_create1 | 827 | .quad sys_epoll_create1 |
| 828 | .quad sys_dup3 /* 330 */ | 828 | .quad sys_dup3 /* 330 */ |
| 829 | .quad sys_pipe2 | 829 | .quad sys_pipe2 |
| 830 | .quad sys_inotify_init1 | 830 | .quad sys_inotify_init1 |
| 831 | .quad compat_sys_preadv | 831 | .quad compat_sys_preadv |
| 832 | .quad compat_sys_pwritev | 832 | .quad compat_sys_pwritev |
| 833 | .quad compat_sys_rt_tgsigqueueinfo /* 335 */ | ||
| 834 | .quad sys_perf_counter_open | ||
| 833 | ia32_syscall_end: | 835 | ia32_syscall_end: |