Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

5 files changed, 8 insertions, 133 deletions

diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 0debcec23a3..fda1a8123f9 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -527,59 +527,6 @@ asmlinkage long sys32_sendfile64(int out_fd, int in_fd,
         return ret;
 }
 
-#ifdef CONFIG_SYSCTL_SYSCALL
-struct __sysctl_args32 {
-        u32 name;
-        int nlen;
-        u32 oldval;
-        u32 oldlenp;
-        u32 newval;
-        u32 newlen;
-        u32 __unused[4];
-};
-
-asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args)
-{
-        struct __sysctl_args32 tmp;
-        int error;
-        size_t oldlen;
-        size_t __user *oldlenp = NULL;
-        unsigned long addr = (((unsigned long)&args->__unused[0]) + 7) & ~7;
-
-        if (copy_from_user(&tmp, args, sizeof(tmp)))
-                return -EFAULT;
-
-        if (tmp.oldval && tmp.oldlenp) {
-                /* Duh, this is ugly and might not work if sysctl_args
-                   is in read-only memory, but do_sysctl does indirectly
-                   a lot of uaccess in both directions and we'd have to
-                   basically copy the whole sysctl.c here, and
-                   glibc's __sysctl uses rw memory for the structure
-                   anyway.  */
-                if (get_user(oldlen, (u32 __user *)compat_ptr(tmp.oldlenp)) ||
-                    put_user(oldlen, (size_t __user *)addr))
-                        return -EFAULT;
-                oldlenp = (size_t __user *)addr;
-        }
-
-        lock_kernel();
-        error = do_sysctl(compat_ptr(tmp.name), tmp.nlen, compat_ptr(tmp.oldval),
-                          oldlenp, compat_ptr(tmp.newval), tmp.newlen);
-        unlock_kernel();
-        if (oldlenp) {
-                if (!error) {
-                        if (get_user(oldlen, (size_t __user *)addr) ||
-                            put_user(oldlen, (u32 __user *)compat_ptr(tmp.oldlenp)))
-                                error = -EFAULT;
-                }
-                if (copy_to_user(args->__unused, tmp.__unused,
-                                 sizeof(tmp.__unused)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-#endif
-
 struct stat64_emu31 {
         unsigned long long  st_dev;
         unsigned int    __pad1;
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index c07f9ca05ad..45e9092b3aa 100644
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -162,7 +162,6 @@ struct ucontext32 {
         compat_sigset_t         uc_sigmask;     /* mask last for extensibility */
 };
 
-struct __sysctl_args32;
 struct stat64_emu31;
 struct mmap_arg_struct_emu31;
 struct fadvise64_64_args;
@@ -212,7 +211,6 @@ long sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset,
                     size_t count);
 long sys32_sendfile64(int out_fd, int in_fd, compat_loff_t __user *offset,
                       s32 count);
-long sys32_sysctl(struct __sysctl_args32 __user *args);
 long sys32_stat64(char __user * filename, struct stat64_emu31 __user * statbuf);
 long sys32_lstat64(char __user * filename,
                    struct stat64_emu31 __user * statbuf);
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index cbd9901dc0f..30de2d0e52b 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -689,8 +689,6 @@ sys32_fdatasync_wrapper:
         llgfr   %r2,%r2                 # unsigned int
         jg      sys_fdatasync           # branch to system call
 
-#sys32_sysctl_wrapper                   # tbd
-
         .globl  sys32_mlock_wrapper
 sys32_mlock_wrapper:
         llgfr   %r2,%r2                 # unsigned long
@@ -1087,8 +1085,8 @@ sys32_stime_wrapper:
 
         .globl  sys32_sysctl_wrapper
 sys32_sysctl_wrapper:
-        llgtr   %r2,%r2                 # struct __sysctl_args32 *
-        jg      sys32_sysctl
+        llgtr   %r2,%r2                 # struct compat_sysctl_args *
+        jg      compat_sys_sysctl
 
         .globl  sys32_fstat64_wrapper
 sys32_fstat64_wrapper:
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 20f282c911c..071c81f179e 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -893,35 +893,30 @@ s390dbf_procactive(ctl_table *table, int write,
 
 static struct ctl_table s390dbf_table[] = {
         {
-                .ctl_name       = CTL_S390DBF_STOPPABLE,
                 .procname       = "debug_stoppable",
                 .data           = &debug_stoppable,
                 .maxlen         = sizeof(int),
                 .mode           = S_IRUGO | S_IWUSR,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec,
         },
          {
-                .ctl_name       = CTL_S390DBF_ACTIVE,
                 .procname       = "debug_active",
                 .data           = &debug_active,
                 .maxlen         = sizeof(int),
                 .mode           = S_IRUGO | S_IWUSR,
-                .proc_handler   = &s390dbf_procactive,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = s390dbf_procactive,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_table s390dbf_dir_table[] = {
         {
-                .ctl_name       = CTL_S390DBF,
                 .procname       = "s390dbf",
                 .maxlen         = 0,
                 .mode           = S_IRUGO | S_IXUGO,
                 .child          = s390dbf_table,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_table_header *s390dbf_sysctl_header;
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index f5fe34dd821..5a82bc68193 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -203,73 +203,10 @@ out:
 
 #ifdef CONFIG_FTRACE_SYSCALLS
 
-extern unsigned long __start_syscalls_metadata[];
-extern unsigned long __stop_syscalls_metadata[];
 extern unsigned int sys_call_table[];
 
-static struct syscall_metadata **syscalls_metadata;
-
-struct syscall_metadata *syscall_nr_to_meta(int nr)
-{
-        if (!syscalls_metadata || nr >= NR_syscalls || nr < 0)
-                return NULL;
-
-        return syscalls_metadata[nr];
-}
-
-int syscall_name_to_nr(char *name)
-{
-        int i;
-
-        if (!syscalls_metadata)
-                return -1;
-        for (i = 0; i < NR_syscalls; i++)
-                if (syscalls_metadata[i])
-                        if (!strcmp(syscalls_metadata[i]->name, name))
-                                return i;
-        return -1;
-}
-
-void set_syscall_enter_id(int num, int id)
-{
-        syscalls_metadata[num]->enter_id = id;
-}
-
-void set_syscall_exit_id(int num, int id)
+unsigned long __init arch_syscall_addr(int nr)
 {
-        syscalls_metadata[num]->exit_id = id;
-}
-
-static struct syscall_metadata *find_syscall_meta(unsigned long syscall)
-{
-        struct syscall_metadata *start;
-        struct syscall_metadata *stop;
-        char str[KSYM_SYMBOL_LEN];
-
-        start = (struct syscall_metadata *)__start_syscalls_metadata;
-        stop = (struct syscall_metadata *)__stop_syscalls_metadata;
-        kallsyms_lookup(syscall, NULL, NULL, NULL, str);
-
-        for ( ; start < stop; start++) {
-                if (start->name && !strcmp(start->name + 3, str + 3))
-                        return start;
-        }
-        return NULL;
-}
-
-static int __init arch_init_ftrace_syscalls(void)
-{
-        struct syscall_metadata *meta;
-        int i;
-        syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) * NR_syscalls,
-                                    GFP_KERNEL);
-        if (!syscalls_metadata)
-                return -ENOMEM;
-        for (i = 0; i < NR_syscalls; i++) {
-                meta = find_syscall_meta((unsigned long)sys_call_table[i]);
-                syscalls_metadata[i] = meta;
-        }
-        return 0;
+        return (unsigned long)sys_call_table[nr];
 }
-arch_initcall(arch_init_ftrace_syscalls);
 #endif