summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-14 09:02:07 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-14 09:02:07 -0700
commit9ca686626c012935b3b8219815e9027facc6fe6e (patch)
tree632364c2feb6b4c08d83d3014e771dee55f1e4c1 /arch/ia64
parente57a5059846e55d82b86d96dde40e988598601b3 (diff)
parent70524490ee2ea1bbf6cee6c106597b3ac25a3fc2 (diff)
Merge branch 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] splice: add support for sys_tee() [PATCH] splice: pass offset around for ->splice_read() and ->splice_write()
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/entry.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 6e16f6b35bd3..e30798811216 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1609,5 +1609,6 @@ sys_call_table:
data8 sys_set_robust_list
data8 sys_get_robust_list
data8 sys_sync_file_range // 1300
+ data8 sys_tee
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls