From 2c8d51c2fe13ad884530654841386599c4e0aeaa Mon Sep 17 00:00:00 2001
From: Karol Swietlicki <magotari@gmail.com>
Date: Mon, 4 Feb 2008 22:30:50 -0800
Subject: [PATCH] --- yaml --- r: 83181 b: refs/heads/master c:
 6b7e967484f4197d799e14b844b78118e93192c6 h: refs/heads/master i:   83179:
 eab79f26802f1efbce02f761e13e4d2e4c02e955 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/um/include/os.h        | 6 +-----
 trunk/arch/um/kernel/um_arch.c    | 5 ++---
 trunk/arch/um/os-Linux/start_up.c | 4 +---
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a2d26a9a2d9f..44ca307a27cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 291248fd6e371bcbfb8a77689c5d741a1527488f
+refs/heads/master: 6b7e967484f4197d799e14b844b78118e93192c6
diff --git a/trunk/arch/um/include/os.h b/trunk/arch/um/include/os.h
index 55ca073589dc..69c0d4ad0e52 100644
--- a/trunk/arch/um/include/os.h
+++ b/trunk/arch/um/include/os.h
@@ -167,14 +167,10 @@ extern int os_fchange_dir(int fd);
 
 /* start_up.c */
 extern void os_early_checks(void);
-extern int can_do_skas(void);
+extern void can_do_skas(void);
 extern void os_check_bugs(void);
 extern void check_host_supports_tls(int *supports_tls, int *tls_min);
 
-/* Make sure they are clear when running in TT mode. Required by
- * SEGV_MAYBE_FIXABLE */
-#define clear_can_do_skas() do { ptrace_faultinfo = proc_mm = 0; } while (0)
-
 /* mem.c */
 extern int create_mem_file(unsigned long long len);
 
diff --git a/trunk/arch/um/kernel/um_arch.c b/trunk/arch/um/kernel/um_arch.c
index 9b5d2cdb621c..1139e07b968f 100644
--- a/trunk/arch/um/kernel/um_arch.c
+++ b/trunk/arch/um/kernel/um_arch.c
@@ -198,7 +198,7 @@ __uml_setup("--help", Usage,
 "    Prints this message.\n\n"
 );
 
-static int __init uml_checksetup(char *line, int *add)
+static void __init uml_checksetup(char *line, int *add)
 {
 	struct uml_param *p;
 
@@ -208,10 +208,9 @@ static int __init uml_checksetup(char *line, int *add)
 
 		n = strlen(p->str);
 		if (!strncmp(line, p->str, n) && p->setup_func(line + n, add))
-			return 1;
+			return;
 		p++;
 	}
-	return 0;
 }
 
 static void __init uml_postsetup(void)
diff --git a/trunk/arch/um/os-Linux/start_up.c b/trunk/arch/um/os-Linux/start_up.c
index c6cf648a51df..b07887c36bb0 100644
--- a/trunk/arch/um/os-Linux/start_up.c
+++ b/trunk/arch/um/os-Linux/start_up.c
@@ -466,7 +466,7 @@ static inline void check_skas3_proc_mm(void)
 	else non_fatal("found\n");
 }
 
-int can_do_skas(void)
+void can_do_skas(void)
 {
 	non_fatal("Checking for the skas3 patch in the host:\n");
 
@@ -476,8 +476,6 @@ int can_do_skas(void)
 
 	if (!proc_mm || !ptrace_faultinfo || !ptrace_ldt)
 		skas_needs_stub = 1;
-
-	return 1;
 }
 
 int __init parse_iomem(char *str, int *add)