diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-06 12:03:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-06 12:03:58 +1100 |
| commit | 662a106d0ffab3f26c2d19feac3685be757d1cd2 (patch) | |
| tree | 111679f03b88a9f9abad98902fc84b886d726c7b | |
| parent | 36d436721bd0f7fefca3f682985d89c997e8e13f (diff) | |
| parent | 359df6c21ca7535c147f84e10835b4ac71c7ce60 (diff) | |
Merge remote branch 'parisc/next'
| -rw-r--r-- | arch/parisc/include/asm/unistd.h | 4 | ||||
| -rw-r--r-- | arch/parisc/kernel/syscall_table.S | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h index cda158318c62..1ce7d2851d90 100644 --- a/arch/parisc/include/asm/unistd.h +++ b/arch/parisc/include/asm/unistd.h @@ -811,8 +811,10 @@ #define __NR_pwritev (__NR_Linux + 316) #define __NR_rt_tgsigqueueinfo (__NR_Linux + 317) #define __NR_perf_event_open (__NR_Linux + 318) +#define __NR_recvmmsg (__NR_Linux + 319) +#define __NR_accept4 (__NR_Linux + 320) -#define __NR_Linux_syscalls (__NR_perf_event_open + 1) +#define __NR_Linux_syscalls (__NR_accept4 + 1) #define __IGNORE_select /* newselect */ diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 01c4fcf8f481..de5f6dab48b7 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -417,6 +417,8 @@ ENTRY_COMP(pwritev) ENTRY_COMP(rt_tgsigqueueinfo) ENTRY_SAME(perf_event_open) + ENTRY_COMP(recvmmsg) + ENTRY_SAME(accept4) /* 320 */ /* Nothing yet */ |