diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 17:33:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 17:33:34 -0700 |
| commit | 7b35fa86e47f83db27056b202463d926ff0a2c8f (patch) | |
| tree | b5f535a337e4465907a12500eb5e79e3e72bd524 /include/asm-sparc | |
| parent | 29ca069cc6572cce62e42a27efdab01f50190616 (diff) | |
| parent | f1373da87be917e5b2356af44764620487376a07 (diff) | |
| download | talos-obmc-linux-7b35fa86e47f83db27056b202463d926ff0a2c8f.tar.gz talos-obmc-linux-7b35fa86e47f83db27056b202463d926ff0a2c8f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Wire up new system calls.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/unistd_32.h | 8 | ||||
| -rw-r--r-- | include/asm-sparc/unistd_64.h | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/asm-sparc/unistd_32.h b/include/asm-sparc/unistd_32.h index 2338a0276377..648643a9f139 100644 --- a/include/asm-sparc/unistd_32.h +++ b/include/asm-sparc/unistd_32.h @@ -332,8 +332,14 @@ #define __NR_fallocate 314 #define __NR_timerfd_settime 315 #define __NR_timerfd_gettime 316 +#define __NR_signalfd4 317 +#define __NR_eventfd2 318 +#define __NR_epoll_create1 319 +#define __NR_dup3 320 +#define __NR_pipe2 321 +#define __NR_inotify_init1 322 -#define NR_SYSCALLS 317 +#define NR_SYSCALLS 323 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, * it never had the plain ones and there is no value to adding those diff --git a/include/asm-sparc/unistd_64.h b/include/asm-sparc/unistd_64.h index 13be4453a1f0..c5cc0e052321 100644 --- a/include/asm-sparc/unistd_64.h +++ b/include/asm-sparc/unistd_64.h @@ -334,8 +334,14 @@ #define __NR_fallocate 314 #define __NR_timerfd_settime 315 #define __NR_timerfd_gettime 316 +#define __NR_signalfd4 317 +#define __NR_eventfd2 318 +#define __NR_epoll_create1 319 +#define __NR_dup3 320 +#define __NR_pipe2 321 +#define __NR_inotify_init1 322 -#define NR_SYSCALLS 317 +#define NR_SYSCALLS 323 #ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION |
