mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
Merge branches 'pstore-fixes' and 'syscalls2' into release
This commit is contained in:
commit
7415982732
2 changed files with 9 additions and 1 deletions
|
@ -315,11 +315,15 @@
|
||||||
#define __NR_fanotify_init 1323
|
#define __NR_fanotify_init 1323
|
||||||
#define __NR_fanotify_mark 1324
|
#define __NR_fanotify_mark 1324
|
||||||
#define __NR_prlimit64 1325
|
#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__
|
#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
|
* The following defines stop scripts/checksyscalls.sh from complaining about
|
||||||
|
|
|
@ -1771,6 +1771,10 @@ sys_call_table:
|
||||||
data8 sys_fanotify_init
|
data8 sys_fanotify_init
|
||||||
data8 sys_fanotify_mark
|
data8 sys_fanotify_mark
|
||||||
data8 sys_prlimit64 // 1325
|
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
|
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
|
||||||
#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
|
#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
|
||||||
|
|
Loading…
Reference in a new issue