diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
| commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
| tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /include/asm-sparc64/unistd.h | |
| parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
| parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-sparc64/unistd.h')
| -rw-r--r-- | include/asm-sparc64/unistd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index d0544b4f47b7..597f6923a46e 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
| @@ -250,7 +250,7 @@ | |||
| 250 | #ifdef __KERNEL__ | 250 | #ifdef __KERNEL__ |
| 251 | #define __NR_time 231 /* Linux sparc32 */ | 251 | #define __NR_time 231 /* Linux sparc32 */ |
| 252 | #endif | 252 | #endif |
| 253 | #define __NR_sys_splice 232 /* Linux Specific */ | 253 | #define __NR_splice 232 /* Linux Specific */ |
| 254 | #define __NR_stime 233 /* Linux Specific */ | 254 | #define __NR_stime 233 /* Linux Specific */ |
| 255 | #define __NR_statfs64 234 /* Linux Specific */ | 255 | #define __NR_statfs64 234 /* Linux Specific */ |
| 256 | #define __NR_fstatfs64 235 /* Linux Specific */ | 256 | #define __NR_fstatfs64 235 /* Linux Specific */ |
| @@ -298,7 +298,7 @@ | |||
| 298 | #define __NR_mq_notify 277 | 298 | #define __NR_mq_notify 277 |
| 299 | #define __NR_mq_getsetattr 278 | 299 | #define __NR_mq_getsetattr 278 |
| 300 | #define __NR_waitid 279 | 300 | #define __NR_waitid 279 |
| 301 | /*#define __NR_sys_setaltroot 280 available (was setaltroot) */ | 301 | #define __NR_tee 280 |
| 302 | #define __NR_add_key 281 | 302 | #define __NR_add_key 281 |
| 303 | #define __NR_request_key 282 | 303 | #define __NR_request_key 282 |
| 304 | #define __NR_keyctl 283 | 304 | #define __NR_keyctl 283 |