From 2b19f4ff215665598c373dc6ff9e580d05e24a48 Mon Sep 17 00:00:00 2001
From: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Date: Sat, 3 Sep 2005 15:57:51 -0700
Subject: [PATCH] --- yaml --- r: 7041 b: refs/heads/master c:
 d9838d86536fe17e76d19bf3e737100fae618396 h: refs/heads/master i:   7039:
 ab37f6a4bb4463ff0ed15d79f10570678d38ff23 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/um/os-Linux/start_up.c | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d24c2e52006c..599ddc9b444e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07bf731e4b95d7c9ea9dbacd1fc4a041120dfffb
+refs/heads/master: d9838d86536fe17e76d19bf3e737100fae618396
diff --git a/trunk/arch/um/os-Linux/start_up.c b/trunk/arch/um/os-Linux/start_up.c
index a3eab25f3791..a8b5b9d9c6ee 100644
--- a/trunk/arch/um/os-Linux/start_up.c
+++ b/trunk/arch/um/os-Linux/start_up.c
@@ -275,6 +275,30 @@ void os_early_checks(void)
 	check_ptrace();
 }
 
+static int __init noprocmm_cmd_param(char *str, int* add)
+{
+	proc_mm = 0;
+	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)
+{
+	ptrace_faultinfo = 0;
+	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");
+
 #ifdef UML_CONFIG_MODE_SKAS
 static inline void check_skas3_ptrace_support(void)
 {