dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

[PATCH] uml: fix misdeclared function

Browse source 
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>
This commit is contained in:
Jeff Dike 2005-07-27 11:43:33 -07:00 committed by Linus Torvalds
parent 20a64f1d70
commit 0d4579ed55
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/um/kernel/helper.c
View file

@ -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:
*/