diff options
| author | Jeff Dike <jdike@addtoit.com> | 2005-07-27 20:43:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 01:25:49 +0200 |
| commit | 0d4579ed553e8bb29d580c08bfcabcb0826a89c3 (patch) | |
| tree | 7f319523a4ce031378fb14d7b39c6ad0eddf277f /arch | |
| parent | [PATCH] uml: update module interface (diff) | |
| download | linux-0d4579ed553e8bb29d580c08bfcabcb0826a89c3.tar.xz linux-0d4579ed553e8bb29d580c08bfcabcb0826a89c3.zip | |
[PATCH] uml: fix misdeclared function
This fixes an interface which differed from its declaration, and includes
the relevant header so that this doesn't happen again.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/kernel/helper.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/um/kernel/helper.c b/arch/um/kernel/helper.c index 13b1f5c2f7ee..f83e1e8e2392 100644 --- a/arch/um/kernel/helper.c +++ b/arch/um/kernel/helper.c @@ -13,6 +13,7 @@ #include "user.h" #include "kern_util.h" #include "user_util.h" +#include "helper.h" #include "os.h" struct helper_data { @@ -149,7 +150,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, return(pid); } -int helper_wait(int pid, int block) +int helper_wait(int pid) { int ret; @@ -160,14 +161,3 @@ int helper_wait(int pid, int block) } return(ret); } - -/* - * Overrides for Emacs so that we follow Linus's tabbing style. - * Emacs will notice this stuff at the end of the file and automatically - * adjust the settings for this buffer only. This must remain at the end - * of the file. - * --------------------------------------------------------------------------- - * Local variables: - * c-file-style: "linux" - * End: - */ |