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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
arch
/
avr32
/
include
/
asm
/
unistd.h
diff --git
a/arch/avr32/include/asm/unistd.h
b/arch/avr32/include/asm/unistd.h
index
89861a2
..
f714544
100644
(file)
--- a/
arch/avr32/include/asm/unistd.h
+++ b/
arch/avr32/include/asm/unistd.h
@@
-299,9
+299,10
@@
#define __NR_signalfd 279
/* 280 was __NR_timerfd */
#define __NR_eventfd 281
#define __NR_signalfd 279
/* 280 was __NR_timerfd */
#define __NR_eventfd 281
+#define __NR_setns 283
#ifdef __KERNEL__
#ifdef __KERNEL__
-#define NR_syscalls 28
2
+#define NR_syscalls 28
4
/* Old stuff */
#define __IGNORE_uselib
/* Old stuff */
#define __IGNORE_uselib