diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-08-11 09:00:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:37:34 -0700 |
| commit | 0e7d5bb8480e10f98f89bd1d418a430393b1e995 (patch) | |
| tree | 897a474b9ba5758e992b33409103d6f3fb1b9088 /arch | |
| parent | 3838f59fc2ea9821f3ea13adb555bfc6ea43c74c (diff) | |
| download | blackbird-op-linux-0e7d5bb8480e10f98f89bd1d418a430393b1e995.tar.gz blackbird-op-linux-0e7d5bb8480e10f98f89bd1d418a430393b1e995.zip | |
m68k{,nommu}: Wire up new system calls
Wire up for m68k{,nommu} the system calls that were added in the last merge
window:
- 4006553b06306b34054529477b06b68a1c66249b ("flag parameters: inotify_init")
- ed8cae8ba01348bfd83333f4648dd807b04d7f08 ("flag parameters: pipe")
- 336dd1f70ff62d7dd8655228caed4c5bfc818c56 ("flag parameters: dup2")
- a0998b50c3f0b8fdd265c63e0032f86ebe377dbf ("flag parameters: epoll_create")
- 9fe5ad9c8cef9ad5873d8ee55d1cf00d9b607df0 ("flag parameters add-on: remove
epoll_create size param")
- b087498eb5605673b0f260a7620d91818cd72304 ("flag parameters: eventfd")
- 9deb27baedb79759c3ab9435a7d8b841842d56e9 ("flag parameters: signalfd")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 6 | ||||
| -rw-r--r-- | arch/m68knommu/include/asm/unistd.h | 8 | ||||
| -rw-r--r-- | arch/m68knommu/kernel/syscalltable.S | 6 |
3 files changed, 19 insertions, 1 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 18a9c5f4b00d..f28404d9a2bc 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S @@ -747,4 +747,10 @@ sys_call_table: .long sys_fallocate /* 320 */ .long sys_timerfd_settime .long sys_timerfd_gettime + .long sys_signalfd4 + .long sys_eventfd2 + .long sys_epoll_create1 /* 325 */ + .long sys_dup3 + .long sys_pipe2 + .long sys_inotify_init1 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 @@ #define __NR_fallocate 320 #define __NR_timerfd_settime 321 #define __NR_timerfd_gettime 322 +#define __NR_signalfd4 323 +#define __NR_eventfd2 324 +#define __NR_epoll_create1 325 +#define __NR_dup3 326 +#define __NR_pipe2 327 +#define __NR_inotify_init1 328 #ifdef __KERNEL__ -#define NR_syscalls 323 +#define NR_syscalls 329 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index fca2e49917a3..812f8d8b7a85 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S @@ -341,6 +341,12 @@ ENTRY(sys_call_table) .long sys_fallocate /* 320 */ .long sys_timerfd_settime .long sys_timerfd_gettime + .long sys_signalfd4 + .long sys_eventfd2 + .long sys_epoll_create1 /* 325 */ + .long sys_dup3 + .long sys_pipe2 + .long sys_inotify_init1 .rept NR_syscalls-(.-sys_call_table)/4 .long sys_ni_syscall |
