diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
commit | acc696d93dcf993dec123d69d599979e1456ffec (patch) | |
tree | b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 /arch/ia64/kernel/entry.S | |
parent | bf2af2a2027e52b653882fbca840620e896ae081 (diff) | |
parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/ia64/kernel/entry.S')
-rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index e3079881121..bcb80ca5cf4 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1610,5 +1610,6 @@ sys_call_table: 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 |