Merge with temp tree to get David's gdb inferior calls patch
[linux-3.10.git] / arch / ia64 / kernel / entry.S
index 4517d4ab5ef1c2a7905edac6706763d5c6859c2d..9353adc18956aca1dfabf9e21afd05b69ec96c07 100644 (file)
@@ -1411,7 +1411,7 @@ sys_call_table:
        data8 sys_msgrcv
        data8 sys_msgctl
        data8 sys_shmget
-       data8 ia64_shmat
+       data8 sys_shmat
        data8 sys_shmdt                         // 1115
        data8 sys_shmctl
        data8 sys_syslog