diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 19:01:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 19:01:36 +0200 |
| commit | 4b85df0419d1fb135d9d845876e8c7ee1393f83c (patch) | |
| tree | 9630646aa3bca16e9266d79121b479f747d3677c /include | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| parent | [S390] More verbose show_mem() like other architectures. (diff) | |
| download | linux-4b85df0419d1fb135d9d845876e8c7ee1393f83c.tar.xz linux-4b85df0419d1fb135d9d845876e8c7ee1393f83c.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] More verbose show_mem() like other architectures.
[S390] Make use of kretprobe_assert.
[S390] Wire up signald, timerfd and eventfd syscalls.
[S390] Wire up sys_utimensat.
[S390] cio: Update documentation.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/unistd.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h index 5c6f00d62df8..790c1c557417 100644 --- a/include/asm-s390/unistd.h +++ b/include/asm-s390/unistd.h @@ -251,8 +251,12 @@ #define __NR_getcpu 311 #define __NR_epoll_pwait 312 #define __NR_utimes 313 - -#define NR_syscalls 314 +/* Number 314 is reserved for new sys_fallocate */ +#define __NR_utimensat 315 +#define __NR_signalfd 316 +#define __NR_timerfd 317 +#define __NR_eventfd 318 +#define NR_syscalls 319 /* * There are some system calls that are not present on 64 bit, some @@ -346,6 +350,19 @@ #ifdef __KERNEL__ +#ifndef CONFIG_64BIT +#define __IGNORE_select +#else +#define __IGNORE_time +#endif + +/* Ignore NUMA system calls. Not wired up on s390. */ +#define __IGNORE_mbind +#define __IGNORE_get_mempolicy +#define __IGNORE_set_mempolicy +#define __IGNORE_migrate_pages +#define __IGNORE_move_pages + #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_SYS_ALARM |