diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-01 14:36:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-01 14:36:13 -0500 |
| commit | f6d2e6f57bba66272b28dd20c949b14ce39cb804 (patch) | |
| tree | 2bf153af4d5b4b33ad2c1e88347c7fd752fb6332 /arch/x86/include/asm/unistd_64.h | |
| parent | 8caac56305cef98f9357b060a77939d17699937d (diff) | |
| parent | 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 (diff) | |
Merge branch 'x86/urgent' into x86/iommu
Diffstat (limited to 'arch/x86/include/asm/unistd_64.h')
| -rw-r--r-- | arch/x86/include/asm/unistd_64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h index 834b2c1d89fb..d2e415e6666f 100644 --- a/arch/x86/include/asm/unistd_64.h +++ b/arch/x86/include/asm/unistd_64.h | |||
| @@ -639,8 +639,8 @@ __SYSCALL(__NR_fallocate, sys_fallocate) | |||
| 639 | __SYSCALL(__NR_timerfd_settime, sys_timerfd_settime) | 639 | __SYSCALL(__NR_timerfd_settime, sys_timerfd_settime) |
| 640 | #define __NR_timerfd_gettime 287 | 640 | #define __NR_timerfd_gettime 287 |
| 641 | __SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime) | 641 | __SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime) |
| 642 | #define __NR_paccept 288 | 642 | #define __NR_accept4 288 |
| 643 | __SYSCALL(__NR_paccept, sys_paccept) | 643 | __SYSCALL(__NR_accept4, sys_accept4) |
| 644 | #define __NR_signalfd4 289 | 644 | #define __NR_signalfd4 289 |
| 645 | __SYSCALL(__NR_signalfd4, sys_signalfd4) | 645 | __SYSCALL(__NR_signalfd4, sys_signalfd4) |
| 646 | #define __NR_eventfd2 290 | 646 | #define __NR_eventfd2 290 |