diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 12:02:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 12:02:07 -0400 |
| commit | 9ca686626c012935b3b8219815e9027facc6fe6e (patch) | |
| tree | 632364c2feb6b4c08d83d3014e771dee55f1e4c1 /arch/i386/kernel/syscall_table.S | |
| parent | e57a5059846e55d82b86d96dde40e988598601b3 (diff) | |
| parent | 70524490ee2ea1bbf6cee6c106597b3ac25a3fc2 (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/i386/kernel/syscall_table.S')
| -rw-r--r-- | arch/i386/kernel/syscall_table.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S index 4f58b9c0efe3..f48bef15b4f0 100644 --- a/arch/i386/kernel/syscall_table.S +++ b/arch/i386/kernel/syscall_table.S | |||
| @@ -314,3 +314,4 @@ ENTRY(sys_call_table) | |||
| 314 | .long sys_get_robust_list | 314 | .long sys_get_robust_list |
| 315 | .long sys_splice | 315 | .long sys_splice |
| 316 | .long sys_sync_file_range | 316 | .long sys_sync_file_range |
| 317 | .long sys_tee /* 315 */ | ||