diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 00:23:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 00:23:57 -0400 |
| commit | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (patch) | |
| tree | 8c0f10ff685126b084cd86da49d07d0b09f62782 /arch/ia64/kernel | |
| parent | eb3bbf805f8509f03ee479becf8c2f00737e1efb (diff) | |
| parent | a78b2de1e47b66c0f7525057652e99d1592ec77b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Add latest crop of syscalls
[IA64] Fix 64-bit atomic routines to return "long"
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 9a260b317d8d..244704a174de 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1768,6 +1768,9 @@ sys_call_table: | |||
| 1768 | data8 sys_pwritev // 1320 | 1768 | data8 sys_pwritev // 1320 |
| 1769 | data8 sys_rt_tgsigqueueinfo | 1769 | data8 sys_rt_tgsigqueueinfo |
| 1770 | data8 sys_recvmmsg | 1770 | data8 sys_recvmmsg |
| 1771 | data8 sys_fanotify_init | ||
| 1772 | data8 sys_fanotify_mark | ||
| 1773 | data8 sys_prlimit64 // 1325 | ||
| 1771 | 1774 | ||
| 1772 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1775 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
| 1773 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ | 1776 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |