diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 23:34:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 23:34:29 -0500 |
| commit | 746f956beb534ddf73da4346de81f2941c8573f8 (patch) | |
| tree | 5d47c5fa7645fd9f0dedcbfb997f8cbc6e074e72 /include | |
| parent | 367636e8a9ef250d5b255f9d299e1c27cb3d7ea3 (diff) | |
| parent | 0fc9b55606662c4763a4f37add889cfd6a66247a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/unistd.h | 7 | ||||
| -rw-r--r-- | include/asm-sparc64/unistd.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 2ac64e65e336..0615d601a7c6 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -315,11 +315,12 @@ | |||
| 315 | #define __NR_faccessat 296 | 315 | #define __NR_faccessat 296 |
| 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 | 319 | ||
| 319 | /* WARNING: You MAY NOT add syscall numbers larger than 298, since | 320 | /* WARNING: You MAY NOT add syscall numbers larger than 299, since |
| 320 | * all of the syscall tables in the Sparc kernel are | 321 | * all of the syscall tables in the Sparc kernel are |
| 321 | * sized to have 298 entries (starting at zero). Therefore | 322 | * sized to have 299 entries (starting at zero). Therefore |
| 322 | * find a free slot in the 0-298 range. | 323 | * find a free slot in the 0-299 range. |
| 323 | */ | 324 | */ |
| 324 | 325 | ||
| 325 | #define _syscall0(type,name) \ | 326 | #define _syscall0(type,name) \ |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index 84ac2bdb0902..c58ba8a096cf 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
| @@ -317,11 +317,12 @@ | |||
| 317 | #define __NR_faccessat 296 | 317 | #define __NR_faccessat 296 |
| 318 | #define __NR_pselect6 297 | 318 | #define __NR_pselect6 297 |
| 319 | #define __NR_ppoll 298 | 319 | #define __NR_ppoll 298 |
| 320 | #define __NR_unshare 299 | ||
| 320 | 321 | ||
| 321 | /* WARNING: You MAY NOT add syscall numbers larger than 298, since | 322 | /* WARNING: You MAY NOT add syscall numbers larger than 299, since |
| 322 | * all of the syscall tables in the Sparc kernel are | 323 | * all of the syscall tables in the Sparc kernel are |
| 323 | * sized to have 298 entries (starting at zero). Therefore | 324 | * sized to have 299 entries (starting at zero). Therefore |
| 324 | * find a free slot in the 0-298 range. | 325 | * find a free slot in the 0-299 range. |
| 325 | */ | 326 | */ |
| 326 | 327 | ||
| 327 | #define _syscall0(type,name) \ | 328 | #define _syscall0(type,name) \ |