aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2008-08-11 03:00:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-11 13:37:34 -0400
commit0e7d5bb8480e10f98f89bd1d418a430393b1e995 (patch)
tree897a474b9ba5758e992b33409103d6f3fb1b9088 /arch
parent3838f59fc2ea9821f3ea13adb555bfc6ea43c74c (diff)
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.S6
-rw-r--r--arch/m68knommu/include/asm/unistd.h8
-rw-r--r--arch/m68knommu/kernel/syscalltable.S6
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:
747 .long sys_fallocate /* 320 */ 747 .long sys_fallocate /* 320 */
748 .long sys_timerfd_settime 748 .long sys_timerfd_settime
749 .long sys_timerfd_gettime 749 .long sys_timerfd_gettime
750 .long sys_signalfd4
751 .long sys_eventfd2
752 .long sys_epoll_create1 /* 325 */
753 .long sys_dup3
754 .long sys_pipe2
755 .long sys_inotify_init1
750 756
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
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)
341 .long sys_fallocate /* 320 */ 341 .long sys_fallocate /* 320 */
342 .long sys_timerfd_settime 342 .long sys_timerfd_settime
343 .long sys_timerfd_gettime 343 .long sys_timerfd_gettime
344 .long sys_signalfd4
345 .long sys_eventfd2
346 .long sys_epoll_create1 /* 325 */
347 .long sys_dup3
348 .long sys_pipe2
349 .long sys_inotify_init1
344 350
345 .rept NR_syscalls-(.-sys_call_table)/4 351 .rept NR_syscalls-(.-sys_call_table)/4
346 .long sys_ni_syscall 352 .long sys_ni_syscall