leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tony Luck 2011-03-23 09:13:47 -07:00
commit 7415982732
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/ia64/include/asm/unistd.h
View File

@ -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

4
arch/ia64/kernel/entry.S
View File

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