diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 12:48:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 12:48:07 -0700 |
| commit | 23344cb341902f4e3431d8137dca93d6e186d054 (patch) | |
| tree | 2a0e443ade173b80cb0df261f4b2d66f79b9270e /include/asm-sparc64 | |
| parent | bacd3add087770333bdce65cd3dd25e3b2cd67ac (diff) | |
| parent | 289eee6fa78e999208120c856ef3ae5a817fd59c (diff) | |
| download | linux-3.10-23344cb341902f4e3431d8137dca93d6e186d054.tar.gz linux-3.10-23344cb341902f4e3431d8137dca93d6e186d054.tar.bz2 linux-3.10-23344cb341902f4e3431d8137dca93d6e186d054.zip | |
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/asm-sparc64')
| -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 a284986b154..d0544b4f47b 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h @@ -250,7 +250,7 @@ #ifdef __KERNEL__ #define __NR_time 231 /* Linux sparc32 */ #endif -/* #define __NR_oldstat 232 Linux Specific */ +#define __NR_sys_splice 232 /* Linux Specific */ #define __NR_stime 233 /* Linux Specific */ #define __NR_statfs64 234 /* Linux Specific */ #define __NR_fstatfs64 235 /* Linux Specific */ @@ -273,7 +273,7 @@ #define __NR_getsid 252 #define __NR_fdatasync 253 #define __NR_nfsservctl 254 -#define __NR_aplib 255 +#define __NR_sys_sync_file_range 255 #define __NR_clock_settime 256 #define __NR_clock_gettime 257 #define __NR_clock_getres 258 |