diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 13:05:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 13:05:23 -0400 |
| commit | 6d1e9a42e7176bbce9348274784b2e5f69223936 (patch) | |
| tree | 628404d7cffd7ac8ab6629cf5052e21d50e86633 /arch/ia64/kernel | |
| parent | 95985725367e55642755ca6986d0c930cd3738e2 (diff) | |
| parent | 7415982732bcb30100582cff8d2aca12a55123b4 (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:
pstore: cleanups to pstore_dump()
[IA64] New syscalls for 2.6.39
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 244704a174de..6de2e23b3636 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1771,6 +1771,10 @@ sys_call_table: | |||
| 1771 | data8 sys_fanotify_init | 1771 | data8 sys_fanotify_init |
| 1772 | data8 sys_fanotify_mark | 1772 | data8 sys_fanotify_mark |
| 1773 | data8 sys_prlimit64 // 1325 | 1773 | data8 sys_prlimit64 // 1325 |
| 1774 | data8 sys_name_to_handle_at | ||
| 1775 | data8 sys_open_by_handle_at | ||
| 1776 | data8 sys_clock_adjtime | ||
| 1777 | data8 sys_syncfs | ||
| 1774 | 1778 | ||
| 1775 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1779 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
| 1776 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ | 1780 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |