diff options
| author | Andreas Schwab <schwab@suse.de> | 2006-09-04 21:56:09 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-09-08 11:03:40 -0700 |
| commit | 2636255488484e04d6d54303d2b0ec30f7ef7e02 (patch) | |
| tree | 09b682cacdd5b6ef392aa4a85999d87cefe1014d | |
| parent | b8444d00762703e1b6146fce12ce2684885f8bf6 (diff) | |
| download | linux-3.10-2636255488484e04d6d54303d2b0ec30f7ef7e02.tar.gz linux-3.10-2636255488484e04d6d54303d2b0ec30f7ef7e02.tar.bz2 linux-3.10-2636255488484e04d6d54303d2b0ec30f7ef7e02.zip | |
[IA64] Unwire set/get_robust_list
The syscalls set/get_robust_list must not be wired up until
futex_atomic_cmpxchg_inatomic is implemented. Otherwise the kernel will
hang in handle_futex_death.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/kernel/entry.S | 4 | ||||
| -rw-r--r-- | include/asm-ia64/unistd.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 12701cf32d9..fef06571be9 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1605,8 +1605,8 @@ sys_call_table: data8 sys_ni_syscall // 1295 reserved for ppoll data8 sys_unshare data8 sys_splice - data8 sys_set_robust_list - data8 sys_get_robust_list + data8 sys_ni_syscall // reserved for set_robust_list + data8 sys_ni_syscall // reserved for get_robust_list data8 sys_sync_file_range // 1300 data8 sys_tee data8 sys_vmsplice diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index bb0eb727dcd..f581662c5ab 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -286,8 +286,7 @@ /* 1294, 1295 reserved for pselect/ppoll */ #define __NR_unshare 1296 #define __NR_splice 1297 -#define __NR_set_robust_list 1298 -#define __NR_get_robust_list 1299 +/* 1298, 1299 reserved for set_robust_list/get_robust_list */ #define __NR_sync_file_range 1300 #define __NR_tee 1301 #define __NR_vmsplice 1302 |