Auto merge with /home/aegl/GIT/ia64-test

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / ia64 / kernel / entry.S

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 8ebfcc0c813aa744c86e32ae5f576af77080405b..69f88d561d629c1a37ae7491a9229726d5398e3b 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1571,9 +1571,9 @@ sys_call_table:
        data8 sys_add_key
        data8 sys_request_key
        data8 sys_keyctl
-       data8 sys_ni_syscall
-       data8 sys_ni_syscall                    // 1275
-       data8 sys_ni_syscall
+       data8 sys_ioprio_set
+       data8 sys_ioprio_get                    // 1275
+       data8 sys_set_zone_reclaim
        data8 sys_ni_syscall
        data8 sys_ni_syscall
        data8 sys_ni_syscall