diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
| commit | 8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c (patch) | |
| tree | 2478e1708f5a3da261597f4aa1011d4d41c2cc84 /arch/sparc/include/asm/unistd.h | |
| parent | bca606a646a2b1f4fa1ae2b22a0ac707505d7297 (diff) | |
| parent | 5e152b4c9e0fce6149c74406346a7ae7e7a17727 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'arch/sparc/include/asm/unistd.h')
| -rw-r--r-- | arch/sparc/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h index 9d897b6db983..c5387ed0add8 100644 --- a/arch/sparc/include/asm/unistd.h +++ b/arch/sparc/include/asm/unistd.h | |||
| @@ -404,8 +404,9 @@ | |||
| 404 | #define __NR_open_by_handle_at 333 | 404 | #define __NR_open_by_handle_at 333 |
| 405 | #define __NR_clock_adjtime 334 | 405 | #define __NR_clock_adjtime 334 |
| 406 | #define __NR_syncfs 335 | 406 | #define __NR_syncfs 335 |
| 407 | #define __NR_sendmmsg 336 | ||
| 407 | 408 | ||
| 408 | #define NR_syscalls 336 | 409 | #define NR_syscalls 337 |
| 409 | 410 | ||
| 410 | #ifdef __32bit_syscall_numbers__ | 411 | #ifdef __32bit_syscall_numbers__ |
| 411 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, | 412 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |