diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-01 21:33:45 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-01 21:33:45 -0500 |
| 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 @@ | |||
| 345 | #define __NR_pwritev 334 | 345 | #define __NR_pwritev 334 |
| 346 | #define __NR_rt_tgsigqueueinfo 335 | 346 | #define __NR_rt_tgsigqueueinfo 335 |
| 347 | #define __NR_perf_event_open 336 | 347 | #define __NR_perf_event_open 336 |
| 348 | #define __NR_recvmmsg 337 | ||
| 349 | 348 | ||
| 350 | #define NR_syscalls 338 | 349 | #define NR_syscalls 337 |
| 351 | 350 | ||
| 352 | #ifdef __KERNEL__ | 351 | #ifdef __KERNEL__ |
| 353 | 352 | ||
| 353 | #define __IGNORE_recvmmsg | ||
| 354 | |||
| 354 | #define __ARCH_WANT_IPC_PARSE_VERSION | 355 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 355 | #define __ARCH_WANT_OLD_READDIR | 356 | #define __ARCH_WANT_OLD_READDIR |
| 356 | #define __ARCH_WANT_OLD_STAT | 357 | #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 @@ | |||
| 386 | #define __NR_rt_tgsigqueueinfo 363 | 386 | #define __NR_rt_tgsigqueueinfo 363 |
| 387 | #define __NR_perf_event_open 364 | 387 | #define __NR_perf_event_open 364 |
| 388 | #define __NR_recvmmsg 365 | 388 | #define __NR_recvmmsg 365 |
| 389 | #define __NR_accept4 366 | ||
| 389 | 390 | ||
| 390 | #ifdef __KERNEL__ | 391 | #ifdef __KERNEL__ |
| 391 | 392 | ||
| 392 | #define NR_syscalls 366 | 393 | #define NR_syscalls 367 |
| 393 | 394 | ||
| 394 | #define __ARCH_WANT_IPC_PARSE_VERSION | 395 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 395 | #define __ARCH_WANT_OLD_READDIR | 396 | #define __ARCH_WANT_OLD_READDIR |