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/m32r/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/m32r/include/asm/unistd.h')
| -rw-r--r-- | arch/m32r/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m32r/include/asm/unistd.h b/arch/m32r/include/asm/unistd.h index c70545689da8..3e1db561aacc 100644 --- a/arch/m32r/include/asm/unistd.h +++ b/arch/m32r/include/asm/unistd.h | |||
| @@ -330,10 +330,11 @@ | |||
| 330 | /* #define __NR_timerfd 322 removed */ | 330 | /* #define __NR_timerfd 322 removed */ |
| 331 | #define __NR_eventfd 323 | 331 | #define __NR_eventfd 323 |
| 332 | #define __NR_fallocate 324 | 332 | #define __NR_fallocate 324 |
| 333 | #define __NR_setns 325 | ||
| 333 | 334 | ||
| 334 | #ifdef __KERNEL__ | 335 | #ifdef __KERNEL__ |
| 335 | 336 | ||
| 336 | #define NR_syscalls 325 | 337 | #define NR_syscalls 326 |
| 337 | 338 | ||
| 338 | #define __ARCH_WANT_IPC_PARSE_VERSION | 339 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 339 | #define __ARCH_WANT_STAT64 | 340 | #define __ARCH_WANT_STAT64 |