tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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]: __NR_sys_splice --> __NR_splice

Linus Torvalds bf7cf6ee 0b699e36

+2 -2
unified split
+1 -1
include/asm-sparc/unistd.h
··· 248 248 #define __NR_setfsgid 229 /* Linux Specific */ 249 249 #define __NR__newselect 230 /* Linux Specific */ 250 250 #define __NR_time 231 /* Linux Specific */ 251 - #define __NR_sys_splice 232 /* Linux Specific */ 251 + #define __NR_splice 232 /* Linux Specific */ 252 252 #define __NR_stime 233 /* Linux Specific */ 253 253 #define __NR_statfs64 234 /* Linux Specific */ 254 254 #define __NR_fstatfs64 235 /* Linux Specific */
+1 -1
include/asm-sparc64/unistd.h
··· 250 250 #ifdef __KERNEL__ 251 251 #define __NR_time 231 /* Linux sparc32 */ 252 252 #endif 253 - #define __NR_sys_splice 232 /* Linux Specific */ 253 + #define __NR_splice 232 /* Linux Specific */ 254 254 #define __NR_stime 233 /* Linux Specific */ 255 255 #define __NR_statfs64 234 /* Linux Specific */ 256 256 #define __NR_fstatfs64 235 /* Linux Specific */