The patch titled uml: convert functions to void has been removed from the -mm tree. Its filename was uml-convert-functions-to-void.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: uml: convert functions to void From: Karol Swietlicki <magotari@xxxxxxxxx> 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@xxxxxxxxx> Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/include/os.h | 6 +----- arch/um/kernel/um_arch.c | 5 ++--- arch/um/os-Linux/start_up.c | 4 +--- 3 files changed, 4 insertions(+), 11 deletions(-) diff -puN arch/um/include/os.h~uml-convert-functions-to-void arch/um/include/os.h --- a/arch/um/include/os.h~uml-convert-functions-to-void +++ a/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 -puN arch/um/kernel/um_arch.c~uml-convert-functions-to-void arch/um/kernel/um_arch.c --- a/arch/um/kernel/um_arch.c~uml-convert-functions-to-void +++ a/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 *l 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 -puN arch/um/os-Linux/start_up.c~uml-convert-functions-to-void arch/um/os-Linux/start_up.c --- a/arch/um/os-Linux/start_up.c~uml-convert-functions-to-void +++ a/arch/um/os-Linux/start_up.c @@ -466,7 +466,7 @@ static inline void check_skas3_proc_mm(v 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) _ Patches currently in -mm which might be from magotari@xxxxxxxxx are origin.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html