aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorKarol Swietlicki <magotari@gmail.com>2008-02-05 01:30:50 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:26 -0500
commit6b7e967484f4197d799e14b844b78118e93192c6 (patch)
tree61896d643c3a4b302d709a02aa0b7c140c2d8805 /arch/um
parent291248fd6e371bcbfb8a77689c5d741a1527488f (diff)
uml: convert functions to void
This patch changes a few functions into returning void. The return values were not used anyway, so I think it should not be a problem. Also removed a little leftover bit from TT mode. Signed-off-by: Karol Swietlicki <magotari@gmail.com> Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/os.h6
-rw-r--r--arch/um/kernel/um_arch.c5
-rw-r--r--arch/um/os-Linux/start_up.c4
3 files changed, 4 insertions, 11 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 55ca073589dc..69c0d4ad0e52 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -167,14 +167,10 @@ extern int os_fchange_dir(int fd);
167 167
168/* start_up.c */ 168/* start_up.c */
169extern void os_early_checks(void); 169extern void os_early_checks(void);
170extern int can_do_skas(void); 170extern void can_do_skas(void);
171extern void os_check_bugs(void); 171extern void os_check_bugs(void);
172extern void check_host_supports_tls(int *supports_tls, int *tls_min); 172extern void check_host_supports_tls(int *supports_tls, int *tls_min);
173 173
174/* Make sure they are clear when running in TT mode. Required by
175 * SEGV_MAYBE_FIXABLE */
176#define clear_can_do_skas() do { ptrace_faultinfo = proc_mm = 0; } while (0)
177
178/* mem.c */ 174/* mem.c */
179extern int create_mem_file(unsigned long long len); 175extern int create_mem_file(unsigned long long len);
180 176
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 9b5d2cdb621c..1139e07b968f 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -198,7 +198,7 @@ __uml_setup("--help", Usage,
198" Prints this message.\n\n" 198" Prints this message.\n\n"
199); 199);
200 200
201static int __init uml_checksetup(char *line, int *add) 201static void __init uml_checksetup(char *line, int *add)
202{ 202{
203 struct uml_param *p; 203 struct uml_param *p;
204 204
@@ -208,10 +208,9 @@ static int __init uml_checksetup(char *line, int *add)
208 208
209 n = strlen(p->str); 209 n = strlen(p->str);
210 if (!strncmp(line, p->str, n) && p->setup_func(line + n, add)) 210 if (!strncmp(line, p->str, n) && p->setup_func(line + n, add))
211 return 1; 211 return;
212 p++; 212 p++;
213 } 213 }
214 return 0;
215} 214}
216 215
217static void __init uml_postsetup(void) 216static void __init uml_postsetup(void)
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index c6cf648a51df..b07887c36bb0 100644
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -466,7 +466,7 @@ static inline void check_skas3_proc_mm(void)
466 else non_fatal("found\n"); 466 else non_fatal("found\n");
467} 467}
468 468
469int can_do_skas(void) 469void can_do_skas(void)
470{ 470{
471 non_fatal("Checking for the skas3 patch in the host:\n"); 471 non_fatal("Checking for the skas3 patch in the host:\n");
472 472
@@ -476,8 +476,6 @@ int can_do_skas(void)
476 476
477 if (!proc_mm || !ptrace_faultinfo || !ptrace_ldt) 477 if (!proc_mm || !ptrace_faultinfo || !ptrace_ldt)
478 skas_needs_stub = 1; 478 skas_needs_stub = 1;
479
480 return 1;
481} 479}
482 480
483int __init parse_iomem(char *str, int *add) 481int __init parse_iomem(char *str, int *add)