diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 10:05:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 10:05:23 -0700 |
| commit | 6d1e9a42e7176bbce9348274784b2e5f69223936 (patch) | |
| tree | 628404d7cffd7ac8ab6629cf5052e21d50e86633 /arch | |
| parent | 95985725367e55642755ca6986d0c930cd3738e2 (diff) | |
| parent | 7415982732bcb30100582cff8d2aca12a55123b4 (diff) | |
| download | linux-3.10-6d1e9a42e7176bbce9348274784b2e5f69223936.tar.gz linux-3.10-6d1e9a42e7176bbce9348274784b2e5f69223936.tar.bz2 linux-3.10-6d1e9a42e7176bbce9348274784b2e5f69223936.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
pstore: cleanups to pstore_dump()
[IA64] New syscalls for 2.6.39
Diffstat (limited to 'arch')
| -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 */ |