Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / asm-xtensa / unistd.h

diff --git a/include/asm-xtensa/unistd.h b/include/asm-xtensa/unistd.h
index 78ad761e6d5c1dd7716439afa67cce6f51fdba92..c092c8fbb2cf918def5f3a54ace7fcc78c9bfa55 100644 (file)
--- a/include/asm-xtensa/unistd.h
+++ b/include/asm-xtensa/unistd.h
@@ -151,7 +151,7 @@ __SYSCALL( 61, sys_fcntl64, 3)
 #define __NR_available62                        62
 __SYSCALL( 62, sys_ni_syscall, 0)
 #define __NR_fadvise64_64                       63
-__SYSCALL( 63, sys_fadvise64_64, 6)
+__SYSCALL( 63, xtensa_fadvise64_64, 6)
 #define __NR_utime                              64     /* glibc 2.3.3 ?? */
 __SYSCALL( 64, sys_utime, 2)
 #define __NR_utimes                             65
@@ -339,8 +339,8 @@ __SYSCALL(148, sys_setpgid, 2)
 __SYSCALL(149, sys_getpgid, 1)
 #define __NR_getppid                           150
 __SYSCALL(150, sys_getppid, 0)
-#define __NR_available151                      151
-__SYSCALL(151, sys_ni_syscall, 0)
+#define __NR_getpgrp                           151
+__SYSCALL(151, sys_getpgrp, 0)
 
 #define __NR_reserved152                       152     /* set_thread_area */
 __SYSCALL(152, sys_ni_syscall, 0)
@@ -677,8 +677,8 @@ __SYSCALL(303, sys_ni_syscall, 0)
 
 #define __NR_signalfd                          304
 __SYSCALL(304, sys_signalfd, 3)
-#define __NR_timerfd                           305
-__SYSCALL(305, sys_timerfd, 4)
+/*  305 was __NR_timerfd  */
+__SYSCALL(305, sys_ni_syscall, 0)
 #define __NR_eventfd                           306
 __SYSCALL(306, sys_eventfd, 1)