diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/xtensa/include/asm/unistd.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/xtensa/include/asm/unistd.h')
| -rw-r--r-- | arch/xtensa/include/asm/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/unistd.h b/arch/xtensa/include/asm/unistd.h index 528042c2951e..a6f934f37f1a 100644 --- a/arch/xtensa/include/asm/unistd.h +++ b/arch/xtensa/include/asm/unistd.h | |||
| @@ -683,8 +683,10 @@ __SYSCALL(305, sys_ni_syscall, 0) | |||
| 683 | __SYSCALL(306, sys_eventfd, 1) | 683 | __SYSCALL(306, sys_eventfd, 1) |
| 684 | #define __NR_recvmmsg 307 | 684 | #define __NR_recvmmsg 307 |
| 685 | __SYSCALL(307, sys_recvmmsg, 5) | 685 | __SYSCALL(307, sys_recvmmsg, 5) |
| 686 | #define __NR_setns 308 | ||
| 687 | __SYSCALL(308, sys_setns, 2) | ||
| 686 | 688 | ||
| 687 | #define __NR_syscall_count 308 | 689 | #define __NR_syscall_count 309 |
| 688 | 690 | ||
| 689 | /* | 691 | /* |
| 690 | * sysxtensa syscall handler | 692 | * sysxtensa syscall handler |