diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:48:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:48:07 -0400 |
| commit | 23344cb341902f4e3431d8137dca93d6e186d054 (patch) | |
| tree | 2a0e443ade173b80cb0df261f4b2d66f79b9270e /include | |
| parent | bacd3add087770333bdce65cd3dd25e3b2cd67ac (diff) | |
| parent | 289eee6fa78e999208120c856ef3ae5a817fd59c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Wire up sys_sync_file_range() into syscall tables.
[SPARC]: Wire up sys_splice() into the syscall tables.
[SPARC64]: Update defconfig.
[SPARC64]: Align address in huge_pte_alloc().
[SPARC64]: Document the instruction checks we do in do_sparc64_fault().
[SPARC64]: Make tsb_sync() mm comparison more precise.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/unistd.h | 6 | ||||
| -rw-r--r-- | include/asm-sparc64/unistd.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 64ec640a40..264f0ebeae 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -180,7 +180,7 @@ | |||
| 180 | #define __NR_sched_get_affinity 161 /* Linux specific, getfh under SunOS */ | 180 | #define __NR_sched_get_affinity 161 /* Linux specific, getfh under SunOS */ |
| 181 | #define __NR_getdomainname 162 /* SunOS Specific */ | 181 | #define __NR_getdomainname 162 /* SunOS Specific */ |
| 182 | #define __NR_setdomainname 163 /* Common */ | 182 | #define __NR_setdomainname 163 /* Common */ |
| 183 | /* #define __NR_ni_syscall 164 ENOSYS under SunOS */ | 183 | /* #define __NR_utrap_install 164 Linux sparc64 specific */ |
| 184 | #define __NR_quotactl 165 /* Common */ | 184 | #define __NR_quotactl 165 /* Common */ |
| 185 | #define __NR_set_tid_address 166 /* Linux specific, exportfs under SunOS */ | 185 | #define __NR_set_tid_address 166 /* Linux specific, exportfs under SunOS */ |
| 186 | #define __NR_mount 167 /* Common */ | 186 | #define __NR_mount 167 /* Common */ |
| @@ -248,7 +248,7 @@ | |||
| 248 | #define __NR_setfsgid 229 /* Linux Specific */ | 248 | #define __NR_setfsgid 229 /* Linux Specific */ |
| 249 | #define __NR__newselect 230 /* Linux Specific */ | 249 | #define __NR__newselect 230 /* Linux Specific */ |
| 250 | #define __NR_time 231 /* Linux Specific */ | 250 | #define __NR_time 231 /* Linux Specific */ |
| 251 | /* #define __NR_oldstat 232 Linux Specific */ | 251 | #define __NR_sys_splice 232 /* Linux Specific */ |
| 252 | #define __NR_stime 233 /* Linux Specific */ | 252 | #define __NR_stime 233 /* Linux Specific */ |
| 253 | #define __NR_statfs64 234 /* Linux Specific */ | 253 | #define __NR_statfs64 234 /* Linux Specific */ |
| 254 | #define __NR_fstatfs64 235 /* Linux Specific */ | 254 | #define __NR_fstatfs64 235 /* Linux Specific */ |
| @@ -271,7 +271,7 @@ | |||
| 271 | #define __NR_getsid 252 | 271 | #define __NR_getsid 252 |
| 272 | #define __NR_fdatasync 253 | 272 | #define __NR_fdatasync 253 |
| 273 | #define __NR_nfsservctl 254 | 273 | #define __NR_nfsservctl 254 |
| 274 | #define __NR_aplib 255 | 274 | #define __NR_sys_sync_file_range 255 |
| 275 | #define __NR_clock_settime 256 | 275 | #define __NR_clock_settime 256 |
| 276 | #define __NR_clock_gettime 257 | 276 | #define __NR_clock_gettime 257 |
| 277 | #define __NR_clock_getres 258 | 277 | #define __NR_clock_getres 258 |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index a284986b15..d0544b4f47 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_oldstat 232 Linux Specific */ | 253 | #define __NR_sys_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 */ |
| @@ -273,7 +273,7 @@ | |||
| 273 | #define __NR_getsid 252 | 273 | #define __NR_getsid 252 |
| 274 | #define __NR_fdatasync 253 | 274 | #define __NR_fdatasync 253 |
| 275 | #define __NR_nfsservctl 254 | 275 | #define __NR_nfsservctl 254 |
| 276 | #define __NR_aplib 255 | 276 | #define __NR_sys_sync_file_range 255 |
| 277 | #define __NR_clock_settime 256 | 277 | #define __NR_clock_settime 256 |
| 278 | #define __NR_clock_gettime 257 | 278 | #define __NR_clock_gettime 257 |
| 279 | #define __NR_clock_getres 258 | 279 | #define __NR_clock_getres 258 |