Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf7cf6ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0b699e36 2784f40e

include/asm-sparc/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ 
#define __NR_setfsgid           229 /* Linux Specific                              */

#define __NR__newselect         230 /* Linux Specific                              */

#define __NR_time               231 /* Linux Specific                              */

#define __NR_sys_splice         232 /* Linux Specific                              */

#define __NR_splice             232 /* Linux Specific                              */

#define __NR_stime              233 /* Linux Specific                              */

#define __NR_statfs64           234 /* Linux Specific                              */

#define __NR_fstatfs64          235 /* Linux Specific                              */

include/asm-sparc64/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ 
#ifdef __KERNEL__

#define __NR_time		231 /* Linux sparc32                               */

#endif

#define __NR_sys_splice         232 /* Linux Specific                              */

#define __NR_splice             232 /* Linux Specific                              */

#define __NR_stime              233 /* Linux Specific                              */

#define __NR_statfs64           234 /* Linux Specific                              */

#define __NR_fstatfs64          235 /* Linux Specific                              */