Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b7e9674 authored by Karol Swietlicki's avatar Karol Swietlicki Committed by Linus Torvalds
Browse files

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: default avatarKarol Swietlicki <magotari@gmail.com>
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 291248fd

arch/um/include/os.h

+1 −5
Original line number Diff line number Diff line
@@ -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);

arch/um/kernel/um_arch.c

+2 −3
Original line number Diff line number Diff line
@@ -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)

arch/um/os-Linux/start_up.c

+1 −3
Original line number Diff line number Diff line
@@ -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)