[PATCH] uml: fix syscall table by including $(SUBARCH)'s one, for x86-64

Reuse asm-x86-64/unistd.h to build our syscall table, like x86-64 already
does.

Like for i386, we must add some #defines for all the (right!) changes UML does
to x86-64 syscall table.

Note: I noted a bogus:
	[ __NR_sched_yield ] = (syscall_handler_t *) yield,

while doing this patch (which could only be a workaround for some strange bug,
but I would ignore this possibility).  I'm changing this without notice.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/include/sysdep-x86_64/syscalls.h b/arch/um/include/sysdep-x86_64/syscalls.h
index 65a01e3d87078661431e73720df9e12534542d0a..b56b335c35148d3bd12ce8c210b46cc2461ee88c 100644 (file)
--- a/arch/um/include/sysdep-x86_64/syscalls.h
+++ b/arch/um/include/sysdep-x86_64/syscalls.h
@@ -30,51 +30,6 @@ extern syscall_handler_t wrap_sys_shmat;
 extern syscall_handler_t sys_modify_ldt;
 extern syscall_handler_t sys_arch_prctl;
 
-#define ARCH_SYSCALLS \
-       [ __NR_mmap ] = (syscall_handler_t *) old_mmap, \
-       [ __NR_select ] = (syscall_handler_t *) sys_select, \
-       [ __NR_mincore ] = (syscall_handler_t *) sys_mincore, \
-       [ __NR_madvise ] = (syscall_handler_t *) sys_madvise, \
-       [ __NR_shmget ] = (syscall_handler_t *) sys_shmget, \
-       [ __NR_shmat ] = (syscall_handler_t *) wrap_sys_shmat, \
-       [ __NR_shmctl ] = (syscall_handler_t *) sys_shmctl, \
-       [ __NR_semop ] = (syscall_handler_t *) sys_semop, \
-       [ __NR_semget ] = (syscall_handler_t *) sys_semget, \
-       [ __NR_semctl ] = (syscall_handler_t *) sys_semctl, \
-       [ __NR_shmdt ] = (syscall_handler_t *) sys_shmdt, \
-       [ __NR_msgget ] = (syscall_handler_t *) sys_msgget, \
-       [ __NR_msgsnd ] = (syscall_handler_t *) sys_msgsnd, \
-       [ __NR_msgrcv ] = (syscall_handler_t *) sys_msgrcv, \
-       [ __NR_msgctl ] = (syscall_handler_t *) sys_msgctl, \
-       [ __NR_pivot_root ] = (syscall_handler_t *) sys_pivot_root, \
-       [ __NR_tuxcall ] = (syscall_handler_t *) sys_ni_syscall, \
-       [ __NR_security ] = (syscall_handler_t *) sys_ni_syscall, \
-       [ __NR_epoll_ctl_old ] = (syscall_handler_t *) sys_ni_syscall, \
-       [ __NR_epoll_wait_old ] = (syscall_handler_t *) sys_ni_syscall, \
-       [ __NR_modify_ldt ] = (syscall_handler_t *) sys_modify_ldt, \
-       [ __NR_arch_prctl ] = (syscall_handler_t *) sys_arch_prctl, \
-       [ __NR_socket ] = (syscall_handler_t *) sys_socket, \
-       [ __NR_connect ] = (syscall_handler_t *) sys_connect, \
-       [ __NR_accept ] = (syscall_handler_t *) sys_accept, \
-       [ __NR_recvfrom ] = (syscall_handler_t *) sys_recvfrom, \
-       [ __NR_recvmsg ] = (syscall_handler_t *) sys_recvmsg, \
-       [ __NR_sendmsg ] = (syscall_handler_t *) sys_sendmsg, \
-       [ __NR_bind ] = (syscall_handler_t *) sys_bind, \
-       [ __NR_listen ] = (syscall_handler_t *) sys_listen, \
-       [ __NR_getsockname ] = (syscall_handler_t *) sys_getsockname, \
-       [ __NR_getpeername ] = (syscall_handler_t *) sys_getpeername, \
-       [ __NR_socketpair ] = (syscall_handler_t *) sys_socketpair, \
-       [ __NR_sendto ] = (syscall_handler_t *) sys_sendto, \
-       [ __NR_shutdown ] = (syscall_handler_t *) sys_shutdown, \
-       [ __NR_setsockopt ] = (syscall_handler_t *) sys_setsockopt, \
-       [ __NR_getsockopt ] = (syscall_handler_t *) sys_getsockopt, \
-       [ __NR_iopl ] = (syscall_handler_t *) sys_ni_syscall, \
-       [ __NR_set_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
-       [ __NR_get_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
-       [ __NR_semtimedop ] = (syscall_handler_t *) sys_semtimedop, \
-       [ 251 ] = (syscall_handler_t *) sys_ni_syscall,
-
-#define LAST_ARCH_SYSCALL 251
-#define NR_syscalls 1024
+#define NR_syscalls (__NR_syscall_max + 1)
 
 #endif

diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile
index 274158e7da3fdb2d106c9308e2c4c65cf16f8b99..d7ed2f7908dfbe5d95121196f6991b20573db3ef 100644 (file)
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
@@ -6,7 +6,7 @@
 
 lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o mem.o memcpy.o \
        ptrace.o ptrace_user.o semaphore.o sigcontext.o signal.o \
-       syscalls.o sysrq.o thunk.o sys_call_table.o
+       syscalls.o sysrq.o thunk.o syscall_table.o
 
 USER_OBJS := ptrace_user.o sigcontext.o
 

diff --git a/arch/um/sys-x86_64/sys_call_table.c b/arch/um/sys-x86_64/sys_call_table.c
deleted file mode 100644 (file)
index a31e0df..0000000
--- a/arch/um/sys-x86_64/sys_call_table.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
- * Copyright 2003 PathScale, Inc.
- * Licensed under the GPL
- */
-
-#include "linux/config.h"
-#include "linux/unistd.h"
-#include "linux/sys.h"
-#include "linux/swap.h"
-#include "linux/syscalls.h"
-#include "linux/sysctl.h"
-#include "asm/signal.h"
-#include "sysdep/syscalls.h"
-#include "kern_util.h"
-
-#define LAST_GENERIC_SYSCALL __NR_keyctl
-
-#if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
-#define LAST_SYSCALL LAST_GENERIC_SYSCALL
-#else
-#define LAST_SYSCALL LAST_ARCH_SYSCALL
-#endif
-
-extern syscall_handler_t sys_fork;
-extern syscall_handler_t sys_execve;
-extern syscall_handler_t um_time;
-extern syscall_handler_t um_stime;
-extern syscall_handler_t sys_pipe;
-extern syscall_handler_t sys_olduname;
-extern syscall_handler_t sys_sigaction;
-extern syscall_handler_t sys_sigsuspend;
-extern syscall_handler_t old_readdir;
-extern syscall_handler_t sys_uname;
-extern syscall_handler_t sys_ipc;
-extern syscall_handler_t sys_sigreturn;
-extern syscall_handler_t sys_clone;
-extern syscall_handler_t sys_rt_sigreturn;
-extern syscall_handler_t sys_sigaltstack;
-extern syscall_handler_t sys_vfork;
-extern syscall_handler_t old_select;
-extern syscall_handler_t sys_modify_ldt;
-extern syscall_handler_t sys_rt_sigsuspend;
-extern syscall_handler_t sys_mbind;
-extern syscall_handler_t sys_get_mempolicy;
-extern syscall_handler_t sys_set_mempolicy;
-extern syscall_handler_t sys_sys_setaltroot;
-
-/* On X86-64 all syscalls are aware of 32-bit [ug]ids, so I had to fix this!*/
-syscall_handler_t *sys_call_table[] = {
-       [ __NR_restart_syscall ] = (syscall_handler_t *) sys_restart_syscall,
-       [ __NR_exit ] = (syscall_handler_t *) sys_exit,
-       [ __NR_fork ] = (syscall_handler_t *) sys_fork,
-       [ __NR_read ] = (syscall_handler_t *) sys_read,
-       [ __NR_write ] = (syscall_handler_t *) sys_write,
-
-       /* These three are declared differently in asm/unistd.h */
-       [ __NR_open ] = (syscall_handler_t *) sys_open,
-       [ __NR_close ] = (syscall_handler_t *) sys_close,
-       [ __NR_creat ] = (syscall_handler_t *) sys_creat,
-       [ __NR_link ] = (syscall_handler_t *) sys_link,
-       [ __NR_unlink ] = (syscall_handler_t *) sys_unlink,
-       [ __NR_execve ] = (syscall_handler_t *) sys_execve,
-
-       /* declared differently in kern_util.h */
-       [ __NR_chdir ] = (syscall_handler_t *) sys_chdir,
-       [ __NR_time ] = um_time,
-       [ __NR_mknod ] = (syscall_handler_t *) sys_mknod,
-       [ __NR_chmod ] = (syscall_handler_t *) sys_chmod,
-       [ __NR_lchown ] = (syscall_handler_t *) sys_lchown,
-       [ __NR_lseek ] = (syscall_handler_t *) sys_lseek,
-       [ __NR_getpid ] = (syscall_handler_t *) sys_getpid,
-       [ __NR_mount ] = (syscall_handler_t *) sys_mount,
-       [ __NR_setuid ] = (syscall_handler_t *) sys_setuid,
-       [ __NR_getuid ] = (syscall_handler_t *) sys_getuid,
-       [ __NR_ptrace ] = (syscall_handler_t *) sys_ptrace,
-       [ __NR_alarm ] = (syscall_handler_t *) sys_alarm,
-       [ __NR_pause ] = (syscall_handler_t *) sys_pause,
-       [ __NR_utime ] = (syscall_handler_t *) sys_utime,
-       [ __NR_access ] = (syscall_handler_t *) sys_access,
-       [ __NR_sync ] = (syscall_handler_t *) sys_sync,
-       [ __NR_kill ] = (syscall_handler_t *) sys_kill,
-       [ __NR_rename ] = (syscall_handler_t *) sys_rename,
-       [ __NR_mkdir ] = (syscall_handler_t *) sys_mkdir,
-       [ __NR_rmdir ] = (syscall_handler_t *) sys_rmdir,
-
-       /* Declared differently in asm/unistd.h */
-       [ __NR_dup ] = (syscall_handler_t *) sys_dup,
-       [ __NR_pipe ] = (syscall_handler_t *) sys_pipe,
-       [ __NR_times ] = (syscall_handler_t *) sys_times,
-       [ __NR_brk ] = (syscall_handler_t *) sys_brk,
-       [ __NR_setgid ] = (syscall_handler_t *) sys_setgid,
-       [ __NR_getgid ] = (syscall_handler_t *) sys_getgid,
-       [ __NR_geteuid ] = (syscall_handler_t *) sys_geteuid,
-       [ __NR_getegid ] = (syscall_handler_t *) sys_getegid,
-       [ __NR_acct ] = (syscall_handler_t *) sys_acct,
-       [ __NR_umount2 ] = (syscall_handler_t *) sys_umount,
-       [ __NR_ioctl ] = (syscall_handler_t *) sys_ioctl,
-       [ __NR_fcntl ] = (syscall_handler_t *) sys_fcntl,
-       [ __NR_setpgid ] = (syscall_handler_t *) sys_setpgid,
-       [ __NR_umask ] = (syscall_handler_t *) sys_umask,
-       [ __NR_chroot ] = (syscall_handler_t *) sys_chroot,
-       [ __NR_ustat ] = (syscall_handler_t *) sys_ustat,
-       [ __NR_dup2 ] = (syscall_handler_t *) sys_dup2,
-       [ __NR_getppid ] = (syscall_handler_t *) sys_getppid,
-       [ __NR_getpgrp ] = (syscall_handler_t *) sys_getpgrp,
-       [ __NR_setsid ] = (syscall_handler_t *) sys_setsid,
-       [ __NR_setreuid ] = (syscall_handler_t *) sys_setreuid,
-       [ __NR_setregid ] = (syscall_handler_t *) sys_setregid,
-       [ __NR_sethostname ] = (syscall_handler_t *) sys_sethostname,
-       [ __NR_setrlimit ] = (syscall_handler_t *) sys_setrlimit,
-       [ __NR_getrlimit ] = (syscall_handler_t *) sys_getrlimit,
-       [ __NR_getrusage ] = (syscall_handler_t *) sys_getrusage,
-       [ __NR_gettimeofday ] = (syscall_handler_t *) sys_gettimeofday,
-       [ __NR_settimeofday ] = (syscall_handler_t *) sys_settimeofday,
-       [ __NR_getgroups ] = (syscall_handler_t *) sys_getgroups,
-       [ __NR_setgroups ] = (syscall_handler_t *) sys_setgroups,
-       [ __NR_symlink ] = (syscall_handler_t *) sys_symlink,
-       [ __NR_readlink ] = (syscall_handler_t *) sys_readlink,
-       [ __NR_uselib ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_swapon ] = (syscall_handler_t *) sys_swapon,
-       [ __NR_reboot ] = (syscall_handler_t *) sys_reboot,
-       [ __NR_munmap ] = (syscall_handler_t *) sys_munmap,
-       [ __NR_truncate ] = (syscall_handler_t *) sys_truncate,
-       [ __NR_ftruncate ] = (syscall_handler_t *) sys_ftruncate,
-       [ __NR_fchmod ] = (syscall_handler_t *) sys_fchmod,
-       [ __NR_fchown ] = (syscall_handler_t *) sys_fchown,
-       [ __NR_getpriority ] = (syscall_handler_t *) sys_getpriority,
-       [ __NR_setpriority ] = (syscall_handler_t *) sys_setpriority,
-       [ __NR_statfs ] = (syscall_handler_t *) sys_statfs,
-       [ __NR_fstatfs ] = (syscall_handler_t *) sys_fstatfs,
-       [ __NR_ioperm ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_syslog ] = (syscall_handler_t *) sys_syslog,
-       [ __NR_setitimer ] = (syscall_handler_t *) sys_setitimer,
-       [ __NR_getitimer ] = (syscall_handler_t *) sys_getitimer,
-       [ __NR_stat ] = (syscall_handler_t *) sys_newstat,
-       [ __NR_lstat ] = (syscall_handler_t *) sys_newlstat,
-       [ __NR_fstat ] = (syscall_handler_t *) sys_newfstat,
-       [ __NR_vhangup ] = (syscall_handler_t *) sys_vhangup,
-       [ __NR_wait4 ] = (syscall_handler_t *) sys_wait4,
-       [ __NR_swapoff ] = (syscall_handler_t *) sys_swapoff,
-       [ __NR_sysinfo ] = (syscall_handler_t *) sys_sysinfo,
-       [ __NR_fsync ] = (syscall_handler_t *) sys_fsync,
-       [ __NR_clone ] = (syscall_handler_t *) sys_clone,
-       [ __NR_setdomainname ] = (syscall_handler_t *) sys_setdomainname,
-       [ __NR_uname ] = (syscall_handler_t *) sys_newuname,
-       [ __NR_adjtimex ] = (syscall_handler_t *) sys_adjtimex,
-       [ __NR_mprotect ] = (syscall_handler_t *) sys_mprotect,
-       [ __NR_create_module ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_init_module ] = (syscall_handler_t *) sys_init_module,
-       [ __NR_delete_module ] = (syscall_handler_t *) sys_delete_module,
-       [ __NR_get_kernel_syms ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_quotactl ] = (syscall_handler_t *) sys_quotactl,
-       [ __NR_getpgid ] = (syscall_handler_t *) sys_getpgid,
-       [ __NR_fchdir ] = (syscall_handler_t *) sys_fchdir,
-       [ __NR_sysfs ] = (syscall_handler_t *) sys_sysfs,
-       [ __NR_personality ] = (syscall_handler_t *) sys_personality,
-       [ __NR_afs_syscall ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_setfsuid ] = (syscall_handler_t *) sys_setfsuid,
-       [ __NR_setfsgid ] = (syscall_handler_t *) sys_setfsgid,
-       [ __NR_getdents ] = (syscall_handler_t *) sys_getdents,
-       [ __NR_flock ] = (syscall_handler_t *) sys_flock,
-       [ __NR_msync ] = (syscall_handler_t *) sys_msync,
-       [ __NR_readv ] = (syscall_handler_t *) sys_readv,
-       [ __NR_writev ] = (syscall_handler_t *) sys_writev,
-       [ __NR_getsid ] = (syscall_handler_t *) sys_getsid,
-       [ __NR_fdatasync ] = (syscall_handler_t *) sys_fdatasync,
-       [ __NR__sysctl ] = (syscall_handler_t *) sys_sysctl,
-       [ __NR_mlock ] = (syscall_handler_t *) sys_mlock,
-       [ __NR_munlock ] = (syscall_handler_t *) sys_munlock,
-       [ __NR_mlockall ] = (syscall_handler_t *) sys_mlockall,
-       [ __NR_munlockall ] = (syscall_handler_t *) sys_munlockall,
-       [ __NR_sched_setparam ] = (syscall_handler_t *) sys_sched_setparam,
-       [ __NR_sched_getparam ] = (syscall_handler_t *) sys_sched_getparam,
-       [ __NR_sched_setscheduler ] = (syscall_handler_t *) sys_sched_setscheduler,
-       [ __NR_sched_getscheduler ] = (syscall_handler_t *) sys_sched_getscheduler,
-       [ __NR_sched_yield ] = (syscall_handler_t *) yield,
-       [ __NR_sched_get_priority_max ] = (syscall_handler_t *) sys_sched_get_priority_max,
-       [ __NR_sched_get_priority_min ] = (syscall_handler_t *) sys_sched_get_priority_min,
-       [ __NR_sched_rr_get_interval ] = (syscall_handler_t *) sys_sched_rr_get_interval,
-       [ __NR_nanosleep ] = (syscall_handler_t *) sys_nanosleep,
-       [ __NR_mremap ] = (syscall_handler_t *) sys_mremap,
-       [ __NR_setresuid ] = (syscall_handler_t *) sys_setresuid,
-       [ __NR_getresuid ] = (syscall_handler_t *) sys_getresuid,
-       [ __NR_query_module ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_poll ] = (syscall_handler_t *) sys_poll,
-       [ __NR_nfsservctl ] = (syscall_handler_t *) sys_nfsservctl,
-       [ __NR_setresgid ] = (syscall_handler_t *) sys_setresgid,
-       [ __NR_getresgid ] = (syscall_handler_t *) sys_getresgid,
-       [ __NR_prctl ] = (syscall_handler_t *) sys_prctl,
-       [ __NR_rt_sigreturn ] = (syscall_handler_t *) sys_rt_sigreturn,
-       [ __NR_rt_sigaction ] = (syscall_handler_t *) sys_rt_sigaction,
-       [ __NR_rt_sigprocmask ] = (syscall_handler_t *) sys_rt_sigprocmask,
-       [ __NR_rt_sigpending ] = (syscall_handler_t *) sys_rt_sigpending,
-       [ __NR_rt_sigtimedwait ] = (syscall_handler_t *) sys_rt_sigtimedwait,
-       [ __NR_rt_sigqueueinfo ] = (syscall_handler_t *) sys_rt_sigqueueinfo,
-       [ __NR_rt_sigsuspend ] = (syscall_handler_t *) sys_rt_sigsuspend,
-       [ __NR_pread64 ] = (syscall_handler_t *) sys_pread64,
-       [ __NR_pwrite64 ] = (syscall_handler_t *) sys_pwrite64,
-       [ __NR_chown ] = (syscall_handler_t *) sys_chown,
-       [ __NR_getcwd ] = (syscall_handler_t *) sys_getcwd,
-       [ __NR_capget ] = (syscall_handler_t *) sys_capget,
-       [ __NR_capset ] = (syscall_handler_t *) sys_capset,
-       [ __NR_sigaltstack ] = (syscall_handler_t *) sys_sigaltstack,
-       [ __NR_sendfile ] = (syscall_handler_t *) sys_sendfile64,
-       [ __NR_getpmsg ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_putpmsg ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_vfork ] = (syscall_handler_t *) sys_vfork,
-       [ __NR_getdents64 ] = (syscall_handler_t *) sys_getdents64,
-       [ __NR_gettid ] = (syscall_handler_t *) sys_gettid,
-       [ __NR_readahead ] = (syscall_handler_t *) sys_readahead,
-       [ __NR_setxattr ] = (syscall_handler_t *) sys_setxattr,
-       [ __NR_lsetxattr ] = (syscall_handler_t *) sys_lsetxattr,
-       [ __NR_fsetxattr ] = (syscall_handler_t *) sys_fsetxattr,
-       [ __NR_getxattr ] = (syscall_handler_t *) sys_getxattr,
-       [ __NR_lgetxattr ] = (syscall_handler_t *) sys_lgetxattr,
-       [ __NR_fgetxattr ] = (syscall_handler_t *) sys_fgetxattr,
-       [ __NR_listxattr ] = (syscall_handler_t *) sys_listxattr,
-       [ __NR_llistxattr ] = (syscall_handler_t *) sys_llistxattr,
-       [ __NR_flistxattr ] = (syscall_handler_t *) sys_flistxattr,
-       [ __NR_removexattr ] = (syscall_handler_t *) sys_removexattr,
-       [ __NR_lremovexattr ] = (syscall_handler_t *) sys_lremovexattr,
-       [ __NR_fremovexattr ] = (syscall_handler_t *) sys_fremovexattr,
-       [ __NR_tkill ] = (syscall_handler_t *) sys_tkill,
-       [ __NR_futex ] = (syscall_handler_t *) sys_futex,
-       [ __NR_sched_setaffinity ] = (syscall_handler_t *) sys_sched_setaffinity,
-       [ __NR_sched_getaffinity ] = (syscall_handler_t *) sys_sched_getaffinity,
-       [ __NR_io_setup ] = (syscall_handler_t *) sys_io_setup,
-       [ __NR_io_destroy ] = (syscall_handler_t *) sys_io_destroy,
-       [ __NR_io_getevents ] = (syscall_handler_t *) sys_io_getevents,
-       [ __NR_io_submit ] = (syscall_handler_t *) sys_io_submit,
-       [ __NR_io_cancel ] = (syscall_handler_t *) sys_io_cancel,
-       [ __NR_exit_group ] = (syscall_handler_t *) sys_exit_group,
-       [ __NR_lookup_dcookie ] = (syscall_handler_t *) sys_lookup_dcookie,
-       [ __NR_epoll_create ] = (syscall_handler_t *) sys_epoll_create,
-       [ __NR_epoll_ctl ] = (syscall_handler_t *) sys_epoll_ctl,
-       [ __NR_epoll_wait ] = (syscall_handler_t *) sys_epoll_wait,
-       [ __NR_remap_file_pages ] = (syscall_handler_t *) sys_remap_file_pages,
-       [ __NR_set_tid_address ] = (syscall_handler_t *) sys_set_tid_address,
-       [ __NR_timer_create ] = (syscall_handler_t *) sys_timer_create,
-       [ __NR_timer_settime ] = (syscall_handler_t *) sys_timer_settime,
-       [ __NR_timer_gettime ] = (syscall_handler_t *) sys_timer_gettime,
-       [ __NR_timer_getoverrun ] = (syscall_handler_t *) sys_timer_getoverrun,
-       [ __NR_timer_delete ] = (syscall_handler_t *) sys_timer_delete,
-       [ __NR_clock_settime ] = (syscall_handler_t *) sys_clock_settime,
-       [ __NR_clock_gettime ] = (syscall_handler_t *) sys_clock_gettime,
-       [ __NR_clock_getres ] = (syscall_handler_t *) sys_clock_getres,
-       [ __NR_clock_nanosleep ] = (syscall_handler_t *) sys_clock_nanosleep,
-       [ __NR_tgkill ] = (syscall_handler_t *) sys_tgkill,
-       [ __NR_utimes ] = (syscall_handler_t *) sys_utimes,
-       [ __NR_fadvise64 ] = (syscall_handler_t *) sys_fadvise64,
-       [ __NR_vserver ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_mbind ] = (syscall_handler_t *) sys_mbind,
-       [ __NR_get_mempolicy ] = (syscall_handler_t *) sys_get_mempolicy,
-       [ __NR_set_mempolicy ] = (syscall_handler_t *) sys_set_mempolicy,
-       [ __NR_mq_open ] = (syscall_handler_t *) sys_mq_open,
-       [ __NR_mq_unlink ] = (syscall_handler_t *) sys_mq_unlink,
-       [ __NR_mq_timedsend ] = (syscall_handler_t *) sys_mq_timedsend,
-       [ __NR_mq_timedreceive ] = (syscall_handler_t *) sys_mq_timedreceive,
-       [ __NR_mq_notify ] = (syscall_handler_t *) sys_mq_notify,
-       [ __NR_mq_getsetattr ] = (syscall_handler_t *) sys_mq_getsetattr,
-       [ __NR_kexec_load ] = (syscall_handler_t *) sys_ni_syscall,
-       [ __NR_waitid ] = (syscall_handler_t *) sys_waitid,
-       [ __NR_add_key ] = (syscall_handler_t *) sys_add_key,
-       [ __NR_request_key ] = (syscall_handler_t *) sys_request_key,
-       [ __NR_keyctl ] = (syscall_handler_t *) sys_keyctl,
-
-       ARCH_SYSCALLS
-       [ LAST_SYSCALL + 1 ... NR_syscalls ] =
-               (syscall_handler_t *) sys_ni_syscall
-};

diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c
new file mode 100644 (file)
index 0000000..34b2e84
--- /dev/null
+++ b/arch/um/sys-x86_64/syscall_table.c
@@ -0,0 +1,59 @@
+/* System call table for UML/x86-64, copied from arch/x86_64/kernel/syscall.c
+ * with some changes for UML. */
+
+#include <linux/linkage.h>
+#include <linux/sys.h>
+#include <linux/cache.h>
+#include <linux/config.h>
+
+#define __NO_STUBS
+
+/* Below you can see, in terms of #define's, the differences between the x86-64
+ * and the UML syscall table. */
+
+/* Not going to be implemented by UML, since we have no hardware. */
+#define stub_iopl sys_ni_syscall
+#define sys_ioperm sys_ni_syscall
+
+/* The UML TLS problem. Note that x86_64 does not implement this, so the below
+ * is needed only for the ia32 compatibility. */
+/*#define sys_set_thread_area sys_ni_syscall
+#define sys_get_thread_area sys_ni_syscall*/
+
+/* For __NR_time. The x86-64 name hopefully will change from sys_time64 to
+ * sys_time (since the current situation is bogus). I've sent a patch to cleanup
+ * this. Remove below the obsoleted line. */
+#define sys_time64 um_time
+#define sys_time um_time
+
+/* On UML we call it this way ("old" means it's not mmap2) */
+#define sys_mmap old_mmap
+/* On x86-64 sys_uname is actually sys_newuname plus a compatibility trick.
+ * See arch/x86_64/kernel/sys_x86_64.c */
+#define sys_uname sys_uname64
+
+#define stub_clone sys_clone
+#define stub_fork sys_fork
+#define stub_vfork sys_vfork
+#define stub_execve sys_execve
+#define stub_rt_sigsuspend sys_rt_sigsuspend
+#define stub_sigaltstack sys_sigaltstack
+#define stub_rt_sigreturn sys_rt_sigreturn
+
+#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
+#undef _ASM_X86_64_UNISTD_H_
+#include <asm-x86_64/unistd.h>
+
+#undef __SYSCALL
+#define __SYSCALL(nr, sym) [ nr ] = sym,
+#undef _ASM_X86_64_UNISTD_H_
+
+typedef void (*sys_call_ptr_t)(void);
+
+extern void sys_ni_syscall(void);
+
+sys_call_ptr_t sys_call_table[__NR_syscall_max+1] __cacheline_aligned = {
+       /* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */
+       [0 ... __NR_syscall_max] = &sys_ni_syscall,
+#include <asm-x86_64/unistd.h>
+};

diff --git a/arch/um/sys-x86_64/syscalls.c b/arch/um/sys-x86_64/syscalls.c
index 68205a03364caa444c8683bc77e36bf21ef0d750..15768c96ceb4b176382d378767954c09f06ae89f 100644 (file)
--- a/arch/um/sys-x86_64/syscalls.c
+++ b/arch/um/sys-x86_64/syscalls.c
@@ -14,6 +14,7 @@
 #include "asm/prctl.h" /* XXX This should get the constants from libc */
 #include "choose-mode.h"
 
+/* XXX: copied from x86-64: arch/x86_64/kernel/sys_x86_64.c */
 asmlinkage long wrap_sys_shmat(int shmid, char __user *shmaddr, int shmflg)
 {
        unsigned long raddr;
@@ -21,6 +22,17 @@ asmlinkage long wrap_sys_shmat(int shmid, char __user *shmaddr, int shmflg)
        return do_shmat(shmid, shmaddr, shmflg, &raddr) ?: (long) raddr;
 }
 
+asmlinkage long sys_uname64(struct new_utsname __user * name)
+{
+       int err;
+       down_read(&uts_sem);
+       err = copy_to_user(name, &system_utsname, sizeof (*name));
+       up_read(&uts_sem);
+       if (personality(current->personality) == PER_LINUX32)
+               err |= copy_to_user(&name->machine, "i686", 5);
+       return err ? -EFAULT : 0;
+}
+
 #ifdef CONFIG_MODE_TT
 extern int modify_ldt(int func, void *ptr, unsigned long bytecount);