tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Tony Luck 74159827 9f6af27f

+9 -1
unified split
+5 -1
arch/ia64/include/asm/unistd.h
··· 315 #define __NR_fanotify_init 1323 316 #define __NR_fanotify_mark 1324 317 #define __NR_prlimit64 1325 318 319 #ifdef __KERNEL__ 320 321 322 - #define NR_syscalls 302 /* length of syscall table */ 323 324 /* 325 * The following defines stop scripts/checksyscalls.sh from complaining about
··· 315 #define __NR_fanotify_init 1323 316 #define __NR_fanotify_mark 1324 317 #define __NR_prlimit64 1325 318 + #define __NR_name_to_handle_at 1326 319 + #define __NR_open_by_handle_at 1327 320 + #define __NR_clock_adjtime 1328 321 + #define __NR_syncfs 1329 322 323 #ifdef __KERNEL__ 324 325 326 + #define NR_syscalls 306 /* length of syscall table */ 327 328 /* 329 * The following defines stop scripts/checksyscalls.sh from complaining about
+4
arch/ia64/kernel/entry.S
··· 1771 data8 sys_fanotify_init 1772 data8 sys_fanotify_mark 1773 data8 sys_prlimit64 // 1325 1774 1775 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1776 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
··· 1771 data8 sys_fanotify_init 1772 data8 sys_fanotify_mark 1773 data8 sys_prlimit64 // 1325 1774 + data8 sys_name_to_handle_at 1775 + data8 sys_open_by_handle_at 1776 + data8 sys_clock_adjtime 1777 + data8 sys_syncfs 1778 1779 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1780 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */