diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 07:11:23 +0200 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 07:11:23 +0200 |
commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /arch/ia64/kernel/entry.S | |
parent | Input: move input_device_id to mod_devicetable.h (diff) | |
parent | [PATCH] slab: fix crash on __drain_alien_cahce() during CPU Hotplug (diff) | |
download | linux-7b7e394185014e0f3bd8989cac937003f20ef9ce.tar.xz linux-7b7e394185014e0f3bd8989cac937003f20ef9ce.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/entry.S')
-rw-r--r-- | arch/ia64/kernel/entry.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 750e8e7fbdc3..bcb80ca5cf40 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1606,5 +1606,10 @@ 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_sync_file_range // 1300 + data8 sys_tee + data8 sys_vmsplice .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |