Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 19 years ago
parent
0b699e36b2 2784f40e27
commit
bf7cf6ee1b
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      include/asm-sparc/unistd.h
  2. 1 1
      include/asm-sparc64/unistd.h

+ 1 - 1
include/asm-sparc/unistd.h
View File 

@@ -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                              */

+ 1 - 1
include/asm-sparc64/unistd.h
View File 

@@ -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                              */