diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-23 11:46:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-23 11:46:59 -0400 |
commit | 87ce786ae5f24e336195805a9fc7428a6f922478 (patch) | |
tree | 4e756c5b49dadcd4b9cf46a1a0e3593ccadfb291 /arch/m68knommu/include/asm/unistd.h | |
parent | 8067794bec1cc5de1431102cf0a6a1c7ce75cd85 (diff) | |
parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) |
Merge branch 'x86/cpu' into x86/x2apic
Diffstat (limited to 'arch/m68knommu/include/asm/unistd.h')
-rw-r--r-- | arch/m68knommu/include/asm/unistd.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/m68knommu/include/asm/unistd.h b/arch/m68knommu/include/asm/unistd.h index 4ba98b9c5d79..b034a2f7b444 100644 --- a/arch/m68knommu/include/asm/unistd.h +++ b/arch/m68knommu/include/asm/unistd.h | |||
@@ -326,10 +326,16 @@ | |||
326 | #define __NR_fallocate 320 | 326 | #define __NR_fallocate 320 |
327 | #define __NR_timerfd_settime 321 | 327 | #define __NR_timerfd_settime 321 |
328 | #define __NR_timerfd_gettime 322 | 328 | #define __NR_timerfd_gettime 322 |
329 | #define __NR_signalfd4 323 | ||
330 | #define __NR_eventfd2 324 | ||
331 | #define __NR_epoll_create1 325 | ||
332 | #define __NR_dup3 326 | ||
333 | #define __NR_pipe2 327 | ||
334 | #define __NR_inotify_init1 328 | ||
329 | 335 | ||
330 | #ifdef __KERNEL__ | 336 | #ifdef __KERNEL__ |
331 | 337 | ||
332 | #define NR_syscalls 323 | 338 | #define NR_syscalls 329 |
333 | 339 | ||
334 | #define __ARCH_WANT_IPC_PARSE_VERSION | 340 | #define __ARCH_WANT_IPC_PARSE_VERSION |
335 | #define __ARCH_WANT_OLD_READDIR | 341 | #define __ARCH_WANT_OLD_READDIR |