Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5df1b274 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: Add accept4() syscall
parents 69e4747e 65cc21b4

arch/ia64/include/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -323,11 +323,12 @@ 
#define __NR_sendmmsg			1331

#define __NR_process_vm_readv		1332

#define __NR_process_vm_writev		1333

#define __NR_accept4			1334



#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

arch/ia64/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -1779,6 +1779,7 @@ sys_call_table: 
	data8 sys_sendmmsg

	data8 sys_process_vm_readv

	data8 sys_process_vm_writev

	data8 sys_accept4



	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls

#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */