Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / um / os-Linux / start_up.c

diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index 337518c5042a5cb4895e389202e6a4c5bc9654b2..47f1ff056a54fdc36657728cc3fe99dc5a7f9be0 100644 (file)
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -24,7 +24,6 @@
 #include <ptrace_user.h>
 #include <registers.h>
 #include <skas.h>
-#include <skas_ptrace.h>
 
 static void ptrace_child(void)
 {
@@ -142,44 +141,6 @@ static int stop_ptraced_child(int pid, int exitcode, int mustexit)
        return ret;
 }
 
-/* Changed only during early boot */
-int ptrace_faultinfo;
-static int disable_ptrace_faultinfo;
-
-int ptrace_ldt;
-static int disable_ptrace_ldt;
-
-int proc_mm;
-static int disable_proc_mm;
-
-int have_switch_mm;
-static int disable_switch_mm;
-
-int skas_needs_stub;
-
-static int __init skas0_cmd_param(char *str, int* add)
-{
-       disable_ptrace_faultinfo = 1;
-       disable_ptrace_ldt = 1;
-       disable_proc_mm = 1;
-       disable_switch_mm = 1;
-
-       return 0;
-}
-
-/* The two __uml_setup would conflict, without this stupid alias. */
-
-static int __init mode_skas0_cmd_param(char *str, int* add)
-       __attribute__((alias("skas0_cmd_param")));
-
-__uml_setup("skas0", skas0_cmd_param,
-"skas0\n"
-"    Disables SKAS3 and SKAS4 usage, so that SKAS0 is used\n\n");
-
-__uml_setup("mode=skas0", mode_skas0_cmd_param,
-"mode=skas0\n"
-"    Disables SKAS3 and SKAS4 usage, so that SKAS0 is used.\n\n");
-
 /* Changed only during early boot */
 static int force_sysemu_disabled = 0;
 
@@ -376,121 +337,6 @@ void __init os_early_checks(void)
        stop_ptraced_child(pid, 1, 1);
 }
 
-static int __init noprocmm_cmd_param(char *str, int* add)
-{
-       disable_proc_mm = 1;
-       return 0;
-}
-
-__uml_setup("noprocmm", noprocmm_cmd_param,
-"noprocmm\n"
-"    Turns off usage of /proc/mm, even if host supports it.\n"
-"    To support /proc/mm, the host needs to be patched using\n"
-"    the current skas3 patch.\n\n");
-
-static int __init noptracefaultinfo_cmd_param(char *str, int* add)
-{
-       disable_ptrace_faultinfo = 1;
-       return 0;
-}
-
-__uml_setup("noptracefaultinfo", noptracefaultinfo_cmd_param,
-"noptracefaultinfo\n"
-"    Turns off usage of PTRACE_FAULTINFO, even if host supports\n"
-"    it. To support PTRACE_FAULTINFO, the host needs to be patched\n"
-"    using the current skas3 patch.\n\n");
-
-static int __init noptraceldt_cmd_param(char *str, int* add)
-{
-       disable_ptrace_ldt = 1;
-       return 0;
-}
-
-__uml_setup("noptraceldt", noptraceldt_cmd_param,
-"noptraceldt\n"
-"    Turns off usage of PTRACE_LDT, even if host supports it.\n"
-"    To support PTRACE_LDT, the host needs to be patched using\n"
-"    the current skas3 patch.\n\n");
-
-static inline void check_skas3_ptrace_faultinfo(void)
-{
-       struct ptrace_faultinfo fi;
-       int pid, n;
-
-       non_fatal("  - PTRACE_FAULTINFO...");
-       pid = start_ptraced_child();
-
-       n = ptrace(PTRACE_FAULTINFO, pid, 0, &fi);
-       if (n < 0) {
-               if (errno == EIO)
-                       non_fatal("not found\n");
-               else
-                       perror("not found");
-       } else if (disable_ptrace_faultinfo)
-               non_fatal("found but disabled on command line\n");
-       else {
-               ptrace_faultinfo = 1;
-               non_fatal("found\n");
-       }
-
-       stop_ptraced_child(pid, 1, 1);
-}
-
-static inline void check_skas3_ptrace_ldt(void)
-{
-#ifdef PTRACE_LDT
-       int pid, n;
-       unsigned char ldtbuf[40];
-       struct ptrace_ldt ldt_op = (struct ptrace_ldt) {
-               .func = 2, /* read default ldt */
-               .ptr = ldtbuf,
-               .bytecount = sizeof(ldtbuf)};
-
-       non_fatal("  - PTRACE_LDT...");
-       pid = start_ptraced_child();
-
-       n = ptrace(PTRACE_LDT, pid, 0, (unsigned long) &ldt_op);
-       if (n < 0) {
-               if (errno == EIO)
-                       non_fatal("not found\n");
-               else
-                       perror("not found");
-       } else if (disable_ptrace_ldt)
-               non_fatal("found, but use is disabled\n");
-       else {
-               ptrace_ldt = 1;
-               non_fatal("found\n");
-       }
-
-       stop_ptraced_child(pid, 1, 1);
-#endif
-}
-
-static inline void check_skas3_proc_mm(void)
-{
-       non_fatal("  - /proc/mm...");
-       if (access("/proc/mm", W_OK) < 0)
-               perror("not found");
-       else if (disable_proc_mm)
-               non_fatal("found but disabled on command line\n");
-       else {
-               proc_mm = 1;
-               non_fatal("found\n");
-       }
-}
-
-void can_do_skas(void)
-{
-       non_fatal("Checking for the skas3 patch in the host:\n");
-
-       check_skas3_proc_mm();
-       check_skas3_ptrace_faultinfo();
-       check_skas3_ptrace_ldt();
-
-       if (!proc_mm || !ptrace_faultinfo || !ptrace_ldt)
-               skas_needs_stub = 1;
-}
-
 int __init parse_iomem(char *str, int *add)
 {
        struct iomem_region *new;