projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
include
/
asm-x86_64
/
unistd.h
diff --git
a/include/asm-x86_64/unistd.h
b/include/asm-x86_64/unistd.h
index
feb77cb
..
94387c9
100644
(file)
--- a/
include/asm-x86_64/unistd.h
+++ b/
include/asm-x86_64/unistd.h
@@
-617,8
+617,12
@@
__SYSCALL(__NR_tee, sys_tee)
__SYSCALL(__NR_sync_file_range, sys_sync_file_range)
#define __NR_vmsplice 278
__SYSCALL(__NR_vmsplice, sys_vmsplice)
__SYSCALL(__NR_sync_file_range, sys_sync_file_range)
#define __NR_vmsplice 278
__SYSCALL(__NR_vmsplice, sys_vmsplice)
+#define __NR_move_pages 279
+__SYSCALL(__NR_move_pages, sys_move_pages)
-#define __NR_syscall_max __NR_vmsplice
+#ifdef __KERNEL__
+
+#define __NR_syscall_max __NR_move_pages
#ifndef __NO_STUBS
#ifndef __NO_STUBS
@@
-635,7
+639,6
@@
do { \
return (type) (res); \
} while (0)
return (type) (res); \
} while (0)
-#ifdef __KERNEL__
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
#define __ARCH_WANT_SYS_ALARM
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
#define __ARCH_WANT_SYS_ALARM
@@
-657,7
+660,6
@@
do { \
#define __ARCH_WANT_SYS_RT_SIGACTION
#define __ARCH_WANT_SYS_TIME
#define __ARCH_WANT_COMPAT_SYS_TIME
#define __ARCH_WANT_SYS_RT_SIGACTION
#define __ARCH_WANT_SYS_TIME
#define __ARCH_WANT_COMPAT_SYS_TIME
-#endif
#ifndef __KERNEL_SYSCALLS__
#ifndef __KERNEL_SYSCALLS__
@@
-821,7
+823,7
@@
asmlinkage long sys_pipe(int *fildes);
#endif /* __KERNEL_SYSCALLS__ */
#endif /* __KERNEL_SYSCALLS__ */
-#if
!defined(__ASSEMBLY__) && defined(__KERNEL__)
+#if
ndef __ASSEMBLY__
#include <linux/linkage.h>
#include <linux/compiler.h>
#include <linux/linkage.h>
#include <linux/compiler.h>
@@
-848,4
+850,5
@@
asmlinkage long sys_rt_sigaction(int sig,
*/
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
*/
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+#endif /* __KERNEL__ */
#endif
#endif