git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
unistd.h
diff --git
a/arch/ia64/include/asm/unistd.h
b/arch/ia64/include/asm/unistd.h
index
404d037
..
1cf0f49
100644
(file)
--- a/
arch/ia64/include/asm/unistd.h
+++ b/
arch/ia64/include/asm/unistd.h
@@
-319,11
+319,12
@@
#define __NR_open_by_handle_at 1327
#define __NR_clock_adjtime 1328
#define __NR_syncfs 1329
#define __NR_open_by_handle_at 1327
#define __NR_clock_adjtime 1328
#define __NR_syncfs 1329
+#define __NR_setns 1330
#ifdef __KERNEL__
#ifdef __KERNEL__
-#define NR_syscalls 30
6
/* length of syscall table */
+#define NR_syscalls 30
7
/* length of syscall table */
/*
* The following defines stop scripts/checksyscalls.sh from complaining about
/*
* The following defines stop scripts/checksyscalls.sh from complaining about