diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /include/asm-sparc/unistd.h | |
parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-sparc/unistd.h')
-rw-r--r-- | include/asm-sparc/unistd.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 5489c5a3c777..2553762465ca 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
@@ -316,12 +316,14 @@ | |||
316 | #define __NR_pselect6 297 | 316 | #define __NR_pselect6 297 |
317 | #define __NR_ppoll 298 | 317 | #define __NR_ppoll 298 |
318 | #define __NR_unshare 299 | 318 | #define __NR_unshare 299 |
319 | #define __NR_set_robust_list 300 | ||
320 | #define __NR_get_robust_list 301 | ||
319 | 321 | ||
320 | #ifdef __KERNEL__ | 322 | #ifdef __KERNEL__ |
321 | /* WARNING: You MAY NOT add syscall numbers larger than 299, since | 323 | /* WARNING: You MAY NOT add syscall numbers larger than 301, since |
322 | * all of the syscall tables in the Sparc kernel are | 324 | * all of the syscall tables in the Sparc kernel are |
323 | * sized to have 299 entries (starting at zero). Therefore | 325 | * sized to have 301 entries (starting at zero). Therefore |
324 | * find a free slot in the 0-299 range. | 326 | * find a free slot in the 0-301 range. |
325 | */ | 327 | */ |
326 | 328 | ||
327 | #define _syscall0(type,name) \ | 329 | #define _syscall0(type,name) \ |