Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108110
b: refs/heads/master
c: 0e7d5bb
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Aug 11, 2008
1 parent a6665e0 commit 4617311
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3838f59fc2ea9821f3ea13adb555bfc6ea43c74c
refs/heads/master: 0e7d5bb8480e10f98f89bd1d418a430393b1e995
6 changes: 6 additions & 0 deletions trunk/arch/m68k/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -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

8 changes: 7 additions & 1 deletion trunk/arch/m68knommu/include/asm/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions trunk/arch/m68knommu/kernel/syscalltable.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion trunk/include/asm-m68k/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,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
Expand Down

0 comments on commit 4617311

Please sign in to comment.