diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 18:14:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 18:14:08 -0700 |
| commit | 19147d0eb1472eac690a9a708893d4de096bbfcf (patch) | |
| tree | 7d68cc017199365b224c072130e64bfd929f7703 /arch/sparc/include/asm/unistd.h | |
| parent | 2a6a432a9ce55876b92f9ea860d7baa05538de16 (diff) | |
| parent | 86fa04b8742ac681d470786f55e2403ada0075b2 (diff) | |
| download | op-kernel-dev-19147d0eb1472eac690a9a708893d4de096bbfcf.zip op-kernel-dev-19147d0eb1472eac690a9a708893d4de096bbfcf.tar.gz | |
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:
sparc64: Fix atomic64_t routine return values.
sparc64: Fix rwsem constant bug leading to hangs.
sparc: Hook up new fanotify and prlimit64 syscalls.
sparc: Really fix "console=" for serial consoles.
Diffstat (limited to 'arch/sparc/include/asm/unistd.h')
| -rw-r--r-- | arch/sparc/include/asm/unistd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h index d0b3b01..03eb5a8 100644 --- a/arch/sparc/include/asm/unistd.h +++ b/arch/sparc/include/asm/unistd.h @@ -397,8 +397,11 @@ #define __NR_rt_tgsigqueueinfo 326 #define __NR_perf_event_open 327 #define __NR_recvmmsg 328 +#define __NR_fanotify_init 329 +#define __NR_fanotify_mark 330 +#define __NR_prlimit64 331 -#define NR_syscalls 329 +#define NR_syscalls 332 #ifdef __32bit_syscall_numbers__ /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |
