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

Commit 72ae9e09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] wire up preadv/pwritev system calls
parents 7b85a88c 8851d371

arch/ia64/include/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -308,11 +308,13 @@ 
#define __NR_dup3			1316

#define __NR_pipe2			1317

#define __NR_inotify_init1		1318

#define __NR_preadv			1319

#define __NR_pwritev			1320



#ifdef __KERNEL__





#define NR_syscalls			295 /* length of syscall table */

#define NR_syscalls			297 /* length of syscall table */



/*

 * The following defines stop scripts/checksyscalls.sh from complaining about

arch/ia64/kernel/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -1803,6 +1803,8 @@ sys_call_table: 
	data8 sys_dup3

	data8 sys_pipe2

	data8 sys_inotify_init1

	data8 sys_preadv

	data8 sys_pwritev			// 1320



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

#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */