diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-09-26 14:04:42 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-09-26 14:04:42 -0700 |
| commit | 5c55cd63a77a85f603c98c2171a8054ca34b6a9f (patch) | |
| tree | 44a849c2e4e40dc56733a88a0aa6a22c0f471e60 | |
| parent | a192dc16000241dc02990a36b6830839b73c44de (diff) | |
| download | kernel_samsung_smdk4412-5c55cd63a77a85f603c98c2171a8054ca34b6a9f.zip kernel_samsung_smdk4412-5c55cd63a77a85f603c98c2171a8054ca34b6a9f.tar.gz kernel_samsung_smdk4412-5c55cd63a77a85f603c98c2171a8054ca34b6a9f.tar.bz2 | |
Revert "[IA64] Unwire set/get_robust_list"
This reverts commit 2636255488484e04d6d54303d2b0ec30f7ef7e02.
Jakub Jelinek provided the missing futex_atomic_cmpxchg_inatomic()
function, so now it should be safe to re-enable these syscalls.
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, 4 insertions, 3 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index fef0657..12701cf 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_ni_syscall // reserved for set_robust_list - data8 sys_ni_syscall // reserved for get_robust_list + data8 sys_set_robust_list + data8 sys_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 f581662..bb0eb72 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -286,7 +286,8 @@ /* 1294, 1295 reserved for pselect/ppoll */ #define __NR_unshare 1296 #define __NR_splice 1297 -/* 1298, 1299 reserved for set_robust_list/get_robust_list */ +#define __NR_set_robust_list 1298 +#define __NR_get_robust_list 1299 #define __NR_sync_file_range 1300 #define __NR_tee 1301 #define __NR_vmsplice 1302 |