Skip to content

Commit

Permalink
uml: convert functions to void
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Karol Swietlicki authored and Linus Torvalds committed Feb 5, 2008
1 parent 291248f commit 6b7e967
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
6 changes: 1 addition & 5 deletions arch/um/include/os.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
5 changes: 2 additions & 3 deletions arch/um/kernel/um_arch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions arch/um/os-Linux/start_up.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand All @@ -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)
Expand Down

0 comments on commit 6b7e967

Please sign in to comment.