diff --git a/[refs] b/[refs]
index 7e52b8751562..f5d787a3d981 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 068732d9b465cafcc56a745c3931f2fc4e58f48f
+refs/heads/master: bc671aa9838f234ccfc794a77325628f1e41e083
diff --git a/trunk/arch/xtensa/kernel/syscall.c b/trunk/arch/xtensa/kernel/syscall.c
index fe3834bc1dbf..f3e16efcd47a 100644
--- a/trunk/arch/xtensa/kernel/syscall.c
+++ b/trunk/arch/xtensa/kernel/syscall.c
@@ -93,3 +93,8 @@ asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg)
 	return (long)ret;
 }
 
+asmlinkage long xtensa_fadvise64_64(int fd, int advice, unsigned long long offset, unsigned long long len)
+{
+	return sys_fadvise64_64(fd, offset, len, advice);
+}
+
diff --git a/trunk/include/asm-xtensa/syscall.h b/trunk/include/asm-xtensa/syscall.h
index ea9b5132215e..05cebf8f62b1 100644
--- a/trunk/include/asm-xtensa/syscall.h
+++ b/trunk/include/asm-xtensa/syscall.h
@@ -28,6 +28,8 @@ asmlinkage long sys_rt_sigaction(int,
 				 struct sigaction __user *,
 				 size_t);
 asmlinkage long xtensa_shmat(int, char __user *, int);
+asmlinkage long xtensa_fadvise64_64(int, int,
+				    unsigned long long, unsigned long long);
 
 /* Should probably move to linux/syscalls.h */
 struct pollfd;
diff --git a/trunk/include/asm-xtensa/unistd.h b/trunk/include/asm-xtensa/unistd.h
index bed04102407b..92968aabe34e 100644
--- a/trunk/include/asm-xtensa/unistd.h
+++ b/trunk/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