Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

7 files changed, 9 insertions, 288 deletions

diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index dc796c1bf39e..246f0e7fb4cc 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -10,7 +10,7 @@ obj-y = checksum.o config.o exec_kern.o exitcode.o \
         helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \
         physmem.o process.o process_kern.o ptrace.o reboot.o resource.o \
         sigio_user.o sigio_kern.o signal_kern.o signal_user.o smp.o \
-        syscall_kern.o sysrq.o sys_call_table.o tempfile.o time.o time_kern.o \
+        syscall_kern.o sysrq.o tempfile.o time.o time_kern.o \
         tlb.o trap_kern.o trap_user.o uaccess_user.o um_arch.o umid.o \
         user_util.o
 
@@ -53,6 +53,7 @@ quiet_cmd_quote2 = QUOTE   $@
       cmd_quote2 = sed -e '/CONFIG/{'          \
                   -e 's/"CONFIG"\;/""/'        \
                   -e 'r $(obj)/config.tmp'     \
-                  -e 'a""\;'                   \
+                  -e 'a \'                     \
+                  -e '""\;'                    \
                   -e '}'                       \
                   $< > $@
diff --git a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c
index 1d719d5b4bb9..7a943696f950 100644
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
@@ -161,10 +161,6 @@ void *get_current(void)
         return(current);
 }
 
-void prepare_to_copy(struct task_struct *tsk)
-{
-}
-
 int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
                 unsigned long stack_top, struct task_struct * p, 
                 struct pt_regs *regs)
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 7b259a22447e..959b2d2490df 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -143,7 +143,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
         case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
         case PTRACE_CONT: { /* restart after signal. */
                 ret = -EIO;
-                if ((unsigned long) data > _NSIG)
+                if (!valid_signal(data))
                         break;
 
                 child->ptrace &= ~PT_DTRACE;
@@ -179,7 +179,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
 
         case PTRACE_SINGLESTEP: {  /* set the trap flag. */
                 ret = -EIO;
-                if ((unsigned long) data > _NSIG)
+                if (!valid_signal(data))
                         break;
                 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
                 child->ptrace |= PT_DTRACE;
diff --git a/arch/um/kernel/skas/include/uaccess-skas.h b/arch/um/kernel/skas/include/uaccess-skas.h
index 11986c9b9ddf..c35620385da0 100644
--- a/arch/um/kernel/skas/include/uaccess-skas.h
+++ b/arch/um/kernel/skas/include/uaccess-skas.h
@@ -18,7 +18,7 @@
           ((unsigned long) (addr) + (size) <= FIXADDR_USER_END) && \
           ((unsigned long) (addr) + (size) >= (unsigned long)(addr))))
 
-static inline int verify_area_skas(int type, const void * addr,
+static inline int __deprecated verify_area_skas(int type, const void * addr,
                                    unsigned long size)
 {
         return(access_ok_skas(type, addr, size) ? 0 : -EFAULT);
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
index 7575ec489b63..f7da9d027672 100644
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
@@ -3,6 +3,7 @@
  * Licensed under the GPL
  */
 
+#include "linux/compiler.h"
 #include "linux/stddef.h"
 #include "linux/kernel.h"
 #include "linux/string.h"
@@ -61,8 +62,7 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr)
         void *arg;
         int *res;
 
-        /* Some old gccs recognize __va_copy, but not va_copy */
-        __va_copy(args, *(va_list *)arg_ptr);
+        va_copy(args, *(va_list *)arg_ptr);
         addr = va_arg(args, unsigned long);
         len = va_arg(args, int);
         is_write = va_arg(args, int);
diff --git a/arch/um/kernel/sys_call_table.c b/arch/um/kernel/sys_call_table.c
deleted file mode 100644
index 7fc06c85b29d..000000000000
--- a/arch/um/kernel/sys_call_table.c
+++ /dev/null
@@ -1,276 +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"
-
-#ifdef CONFIG_NFSD
-#define NFSSERVCTL sys_nfsservctl
-#else
-#define NFSSERVCTL sys_ni_syscall
-#endif
-
-#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;
-
-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_lchown16,
-        [ __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_setuid16,
-        [ __NR_getuid ] = (syscall_handler_t *) sys_getuid16,
-        [ __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_setgid16,
-        [ __NR_getgid ] = (syscall_handler_t *) sys_getgid16,
-        [ __NR_geteuid ] = (syscall_handler_t *) sys_geteuid16,
-        [ __NR_getegid ] = (syscall_handler_t *) sys_getegid16,
-        [ __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_setreuid16,
-        [ __NR_setregid ] = (syscall_handler_t *) sys_setregid16,
-        [ __NR_sethostname ] = (syscall_handler_t *) sys_sethostname,
-        [ __NR_setrlimit ] = (syscall_handler_t *) sys_setrlimit,
-        [ __NR_getrlimit ] = (syscall_handler_t *) sys_old_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_getgroups16,
-        [ __NR_setgroups ] = (syscall_handler_t *) sys_setgroups16,
-        [ __NR_symlink ] = (syscall_handler_t *) sys_symlink,
-        [ __NR_readlink ] = (syscall_handler_t *) sys_readlink,
-        [ __NR_uselib ] = (syscall_handler_t *) sys_uselib,
-        [ __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_fchown16,
-        [ __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_setfsuid16,
-        [ __NR_setfsgid ] = (syscall_handler_t *) sys_setfsgid16,
-        [ __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_setresuid16,
-        [ __NR_getresuid ] = (syscall_handler_t *) sys_getresuid16,
-        [ __NR_query_module ] = (syscall_handler_t *) sys_ni_syscall,
-        [ __NR_poll ] = (syscall_handler_t *) sys_poll,
-        [ __NR_nfsservctl ] = (syscall_handler_t *) NFSSERVCTL,
-        [ __NR_setresgid ] = (syscall_handler_t *) sys_setresgid16,
-        [ __NR_getresgid ] = (syscall_handler_t *) sys_getresgid16,
-        [ __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_chown16,
-        [ __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_sendfile,
-        [ __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/kernel/tt/include/uaccess-tt.h b/arch/um/kernel/tt/include/uaccess-tt.h
index f0bad010cebd..bb69d6b7d022 100644
--- a/arch/um/kernel/tt/include/uaccess-tt.h
+++ b/arch/um/kernel/tt/include/uaccess-tt.h
@@ -33,7 +33,7 @@ extern unsigned long uml_physmem;
          (((unsigned long) (addr) <= ((unsigned long) (addr) + (size))) && \
           (under_task_size(addr, size) || is_stack(addr, size))))
 
-static inline int verify_area_tt(int type, const void * addr,
+static inline int __deprecated verify_area_tt(int type, const void * addr,
                                  unsigned long size)
 {
         return(access_ok_tt(type, addr, size) ? 0 : -EFAULT);