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 /arch/ia64/include | |
| parent | pstore: cleanups to pstore_dump() (diff) | |
| parent | [IA64] New syscalls for 2.6.39 (diff) | |
| download | linux-dev-7415982732bcb30100582cff8d2aca12a55123b4.tar.xz linux-dev-7415982732bcb30100582cff8d2aca12a55123b4.zip | |
Merge branches 'pstore-fixes' and 'syscalls2' into release
Diffstat (limited to 'arch/ia64/include')
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 954d398a54b4..404d037c5e10 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 |