Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ia64 / ia32 / ia32_entry.S

diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index 4a6319c..368c360 100644 (file)
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -1,6 +1,6 @@
 #include <asm/asmmacro.h>
 #include <asm/ia32.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/signal.h>
 #include <asm/thread_info.h>
 
@@ -215,7 +215,7 @@ ia32_syscall_table:
        data8 sys32_fork
        data8 sys_read
        data8 sys_write
-       data8 sys32_open          /* 5 */
+       data8 compat_sys_open     /* 5 */
        data8 sys_close
        data8 sys32_waitpid
        data8 sys_creat
@@ -223,7 +223,7 @@ ia32_syscall_table:
        data8 sys_unlink          /* 10 */
        data8 ia32_execve
        data8 sys_chdir
-       data8 sys32_time
+       data8 compat_sys_time
        data8 sys_mknod
        data8 sys_chmod           /* 15 */
        data8 sys_lchown        /* 16-bit version */
@@ -235,7 +235,7 @@ ia32_syscall_table:
        data8 sys_oldumount
        data8 sys_setuid        /* 16-bit version */
        data8 sys_getuid        /* 16-bit version */
-       data8 sys_ni_syscall    /* sys_stime is not supported on IA64 */  /* 25 */
+       data8 compat_sys_stime    /* 25 */
        data8 sys32_ptrace
        data8 sys32_alarm
        data8 sys_ni_syscall
@@ -334,7 +334,7 @@ ia32_syscall_table:
        data8 sys_setdomainname
        data8 sys32_newuname
        data8 sys32_modify_ldt
-       data8 sys_ni_syscall    /* adjtimex */
+       data8 compat_sys_adjtimex
        data8 sys32_mprotect      /* 125 */
        data8 compat_sys_sigprocmask
        data8 sys_ni_syscall    /* create_module */
@@ -387,7 +387,7 @@ ia32_syscall_table:
        data8 sys32_rt_sigaction
        data8 sys32_rt_sigprocmask /* 175 */
        data8 sys_rt_sigpending
-       data8 sys32_rt_sigtimedwait
+       data8 compat_sys_rt_sigtimedwait
        data8 sys32_rt_sigqueueinfo
        data8 sys32_rt_sigsuspend
        data8 sys32_pread         /* 180 */
@@ -469,21 +469,21 @@ ia32_syscall_table:
        data8 sys32_epoll_wait
        data8 sys_remap_file_pages
        data8 sys_set_tid_address
-       data8 sys32_timer_create
-       data8 compat_timer_settime      /* 260 */
-       data8 compat_timer_gettime
+       data8 compat_sys_timer_create
+       data8 compat_sys_timer_settime  /* 260 */
+       data8 compat_sys_timer_gettime
        data8 sys_timer_getoverrun
        data8 sys_timer_delete
-       data8 compat_clock_settime
-       data8 compat_clock_gettime /* 265 */
-       data8 compat_clock_getres
-       data8 compat_clock_nanosleep
-       data8 compat_statfs64
-       data8 compat_fstatfs64
+       data8 compat_sys_clock_settime
+       data8 compat_sys_clock_gettime /* 265 */
+       data8 compat_sys_clock_getres
+       data8 compat_sys_clock_nanosleep
+       data8 compat_sys_statfs64
+       data8 compat_sys_fstatfs64
        data8 sys_tgkill        /* 270 */
        data8 compat_sys_utimes
        data8 sys32_fadvise64_64
-       data8 sys_ni_syscall
+       data8 sys32_vserver
        data8 sys_ni_syscall
        data8 sys_ni_syscall    /* 275 */
        data8 sys_ni_syscall
@@ -494,7 +494,7 @@ ia32_syscall_table:
        data8 compat_sys_mq_notify
        data8 compat_sys_mq_getsetattr
        data8 sys_ni_syscall            /* reserved for kexec */
-       data8 sys32_waitid
+       data8 compat_sys_waitid
 
        // guard against failures to increase IA32_NR_syscalls
        .org ia32_syscall_table + 8*IA32_NR_syscalls