lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Browse Source 
* 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: Add accept4() syscall
This commit is contained in:
Linus Torvalds
2012-01-13 20:40:12 -08:00
parent 69e4747ee9 65cc21b452
commit 5df1b274cd
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/ia64/include/asm/unistd.h
View File

@@ -323,11 +323,12 @@
#define __NR_sendmmsg 1331 #define __NR_sendmmsg 1331
#define __NR_process_vm_readv 1332 #define __NR_process_vm_readv 1332
#define __NR_process_vm_writev 1333 #define __NR_process_vm_writev 1333
#define __NR_accept4 1334
#ifdef __KERNEL__ #ifdef __KERNEL__
#define NR_syscalls 310 /* length of syscall table */ #define NR_syscalls 311 /* length of syscall table */
/* /*
* The following defines stop scripts/checksyscalls.sh from complaining about * The following defines stop scripts/checksyscalls.sh from complaining about

1
arch/ia64/kernel/entry.S
View File

@@ -1779,6 +1779,7 @@ sys_call_table:
data8 sys_sendmmsg data8 sys_sendmmsg
data8 sys_process_vm_readv data8 sys_process_vm_readv
data8 sys_process_vm_writev data8 sys_process_vm_writev
data8 sys_accept4
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */