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

Commit 29ca069c 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 new system calls
parents b4615e69 3e4d0cab

arch/ia64/kernel/entry.S

+6 −0
Original line number Original line Diff line number Diff line
@@ -1691,6 +1691,12 @@ sys_call_table: 
	data8 sys_timerfd_create		// 1310

	data8 sys_timerfd_create		// 1310

	data8 sys_timerfd_settime

	data8 sys_timerfd_settime

	data8 sys_timerfd_gettime

	data8 sys_timerfd_gettime

	data8 sys_signalfd4

	data8 sys_eventfd2

	data8 sys_epoll_create1			// 1315

	data8 sys_dup3

	data8 sys_pipe2

	data8 sys_inotify_init1





	.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 */

include/asm-ia64/unistd.h

+7 −1
Original line number Original line Diff line number Diff line
@@ -302,11 +302,17 @@ 
#define __NR_timerfd_create		1310

#define __NR_timerfd_create		1310

#define __NR_timerfd_settime		1311

#define __NR_timerfd_settime		1311

#define __NR_timerfd_gettime		1312

#define __NR_timerfd_gettime		1312

#define __NR_signalfd4			1313

#define __NR_eventfd2			1314

#define __NR_epoll_create1		1315

#define __NR_dup3			1316

#define __NR_pipe2			1317

#define __NR_inotify_init1		1318





#ifdef __KERNEL__

#ifdef __KERNEL__









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

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





/*

/*

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

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