diff options
author | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/include/asm/unistd.h | |
parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/include/asm/unistd.h')
-rw-r--r-- | arch/ia64/include/asm/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 10a9eb05f74d..5a5347f5c4e4 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -310,11 +310,12 @@ #define __NR_inotify_init1 1318 #define __NR_preadv 1319 #define __NR_pwritev 1320 +#define __NR_rt_tgsigqueueinfo 1321 #ifdef __KERNEL__ -#define NR_syscalls 297 /* length of syscall table */ +#define NR_syscalls 298 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about @@ -328,6 +329,7 @@ #define __IGNORE_utime /* utimes() */ #define __IGNORE_getpgrp /* getpgid() */ #define __IGNORE_vfork /* clone() */ +#define __IGNORE_umount2 /* umount() */ #define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_RT_SIGSUSPEND |