diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-01 01:58:38 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-01 01:58:38 -0500 |
| commit | 68727fed5469100bec0764207d7efb7a9ecdee29 (patch) | |
| tree | 7afb58ab7665b90122d3b4505be5c6c9f8bade4b /arch/ia64/kernel/fsys.S | |
| parent | dbfedbb98145375106cee7ec7269611d553819dc (diff) | |
| parent | b5b9d6647c1cd5eee90b58941c55f874c2a7e707 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/ia64/kernel/fsys.S')
| -rw-r--r-- | arch/ia64/kernel/fsys.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S index ac6055c83115..7a05b1cb2ad5 100644 --- a/arch/ia64/kernel/fsys.S +++ b/arch/ia64/kernel/fsys.S | |||
| @@ -878,8 +878,7 @@ fsyscall_table: | |||
| 878 | data8 0 // timer_delete | 878 | data8 0 // timer_delete |
| 879 | data8 0 // clock_settime | 879 | data8 0 // clock_settime |
| 880 | data8 fsys_clock_gettime // clock_gettime | 880 | data8 fsys_clock_gettime // clock_gettime |
| 881 | #define __NR_syscall_last 1255 | ||
| 882 | 881 | ||
| 883 | .space 8*(NR_syscalls + 1024 - __NR_syscall_last), 0 | 882 | // fill in zeros for the remaining entries |
| 884 | 883 | .zero: | |
| 885 | .org fsyscall_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 884 | .space fsyscall_table + 8*NR_syscalls - .zero, 0 |