diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-02 11:33:45 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-02 11:33:45 +0900 |
| commit | 9d3f1881abeae0494a27716b08fcf2d3264bb0fa (patch) | |
| tree | f457dd2d35af29bc831b93865efa47229d0b9bee /arch/sh/include/asm | |
| parent | b6c58b1d987a5795086c5c2babd8c7367d2fdb8c (diff) | |
| parent | bc10e875d4aeaa93a0d418d8b4346b72f5067ea0 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/include/asm')
| -rw-r--r-- | arch/sh/include/asm/unistd_32.h | 5 | ||||
| -rw-r--r-- | arch/sh/include/asm/unistd_64.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h index f18c4f9baf27..365744b05269 100644 --- a/arch/sh/include/asm/unistd_32.h +++ b/arch/sh/include/asm/unistd_32.h @@ -345,12 +345,13 @@ #define __NR_pwritev 334 #define __NR_rt_tgsigqueueinfo 335 #define __NR_perf_event_open 336 -#define __NR_recvmmsg 337 -#define NR_syscalls 338 +#define NR_syscalls 337 #ifdef __KERNEL__ +#define __IGNORE_recvmmsg + #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h index 3e7645d11130..25de158aac3a 100644 --- a/arch/sh/include/asm/unistd_64.h +++ b/arch/sh/include/asm/unistd_64.h @@ -386,10 +386,11 @@ #define __NR_rt_tgsigqueueinfo 363 #define __NR_perf_event_open 364 #define __NR_recvmmsg 365 +#define __NR_accept4 366 #ifdef __KERNEL__ -#define NR_syscalls 366 +#define NR_syscalls 367 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR |