diff options
| author | Tony Luck <tony.luck@intel.com> | 2011-03-23 09:13:47 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-03-23 09:13:47 -0700 |
| commit | 7415982732bcb30100582cff8d2aca12a55123b4 (patch) | |
| tree | 2b1b0e3594cf311282fdd14885bbbdcf7ae83707 | |
| parent | 9f6af27fb693c633cc46d36fc1d85efe6d6fbc17 (diff) | |
| parent | 9298168d16faf939141cddc836b6b9b1ef2a8aac (diff) | |
| download | linux-3.10-7415982732bcb30100582cff8d2aca12a55123b4.tar.gz linux-3.10-7415982732bcb30100582cff8d2aca12a55123b4.tar.bz2 linux-3.10-7415982732bcb30100582cff8d2aca12a55123b4.zip | |
Merge branches 'pstore-fixes' and 'syscalls2' into release
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 6 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 954d398a54b..404d037c5e1 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -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 diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 244704a174d..6de2e23b363 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -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 */ |