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 / um / include / sysdep-i386 / syscalls.h

diff --git a/arch/um/include/sysdep-i386/syscalls.h b/arch/um/include/sysdep-i386/syscalls.h
index 47687dc..57bd79e 100644 (file)
--- a/arch/um/include/sysdep-i386/syscalls.h
+++ b/arch/um/include/sysdep-i386/syscalls.h
@@ -8,49 +8,18 @@
 
 typedef long syscall_handler_t(struct pt_regs);
 
-#define EXECUTE_SYSCALL(syscall, regs) \
-       ((long (*)(struct syscall_args)) (*sys_call_table[syscall]))(SYSCALL_ARGS(&regs->regs))
+/* Not declared on x86, incompatible declarations on x86_64, so these have
+ * to go here rather than in sys_call_table.c
+ */
+extern syscall_handler_t sys_rt_sigaction;
 
-#define ARCH_SYSCALLS \
-       [ __NR_mmap ] = (syscall_handler_t *) old_mmap_i386, \
-       [ __NR_select ] = (syscall_handler_t *) old_select, \
-       [ __NR_vm86old ] = (syscall_handler_t *) sys_ni_syscall, \
-        [ __NR_modify_ldt ] = (syscall_handler_t *) sys_modify_ldt, \
-       [ __NR_lchown32 ] = (syscall_handler_t *) sys_lchown, \
-       [ __NR_getuid32 ] = (syscall_handler_t *) sys_getuid, \
-       [ __NR_getgid32 ] = (syscall_handler_t *) sys_getgid, \
-       [ __NR_geteuid32 ] = (syscall_handler_t *) sys_geteuid, \
-       [ __NR_getegid32 ] = (syscall_handler_t *) sys_getegid, \
-       [ __NR_setreuid32 ] = (syscall_handler_t *) sys_setreuid, \
-       [ __NR_setregid32 ] = (syscall_handler_t *) sys_setregid, \
-       [ __NR_getgroups32 ] = (syscall_handler_t *) sys_getgroups, \
-       [ __NR_setgroups32 ] = (syscall_handler_t *) sys_setgroups, \
-       [ __NR_fchown32 ] = (syscall_handler_t *) sys_fchown, \
-       [ __NR_setresuid32 ] = (syscall_handler_t *) sys_setresuid, \
-       [ __NR_getresuid32 ] = (syscall_handler_t *) sys_getresuid, \
-       [ __NR_setresgid32 ] = (syscall_handler_t *) sys_setresgid, \
-       [ __NR_getresgid32 ] = (syscall_handler_t *) sys_getresgid, \
-       [ __NR_chown32 ] = (syscall_handler_t *) sys_chown, \
-       [ __NR_setuid32 ] = (syscall_handler_t *) sys_setuid, \
-       [ __NR_setgid32 ] = (syscall_handler_t *) sys_setgid, \
-       [ __NR_setfsuid32 ] = (syscall_handler_t *) sys_setfsuid, \
-       [ __NR_setfsgid32 ] = (syscall_handler_t *) sys_setfsgid, \
-       [ __NR_pivot_root ] = (syscall_handler_t *) sys_pivot_root, \
-       [ __NR_mincore ] = (syscall_handler_t *) sys_mincore, \
-       [ __NR_madvise ] = (syscall_handler_t *) sys_madvise, \
-        [ 222 ] = (syscall_handler_t *) sys_ni_syscall,
-        
-/* 222 doesn't yet have a name in include/asm-i386/unistd.h */
+extern syscall_handler_t old_mmap_i386;
 
-#define LAST_ARCH_SYSCALL 222
+extern syscall_handler_t *sys_call_table[];
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+#define EXECUTE_SYSCALL(syscall, regs) \
+       ((long (*)(struct syscall_args)) (*sys_call_table[syscall]))(SYSCALL_ARGS(&regs->regs))
+
+extern long sys_mmap2(unsigned long addr, unsigned long len,
+                     unsigned long prot, unsigned long flags,
+                     unsigned long fd, unsigned long pgoff);