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

Commit 74159827 authored by Tony Luck's avatar Tony Luck
Browse files

Merge branches 'pstore-fixes' and 'syscalls2' into release

parents 9f6af27f 9298168d

arch/ia64/include/asm/unistd.h

+5 −1
Original line number Diff line number Diff line
@@ -315,11 +315,15 @@ 
#define __NR_fanotify_init		1323

#define __NR_fanotify_mark		1324

#define __NR_prlimit64			1325

#define __NR_name_to_handle_at		1326

#define __NR_open_by_handle_at  	1327

#define __NR_clock_adjtime		1328

#define __NR_syncfs			1329



#ifdef __KERNEL__





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

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



/*

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

arch/ia64/kernel/entry.S

+4 −0
Original line number Diff line number Diff line
@@ -1771,6 +1771,10 @@ sys_call_table: 
	data8 sys_fanotify_init

	data8 sys_fanotify_mark

	data8 sys_prlimit64			// 1325

	data8 sys_name_to_handle_at

	data8 sys_open_by_handle_at

	data8 sys_clock_adjtime

	data8 sys_syncfs



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

#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */