* [PATCH 4/4] UML - Fix misdeclared function
@ 2005-07-26 20:04 Jeff Dike
0 siblings, 0 replies; only message in thread
From: Jeff Dike @ 2005-07-26 20:04 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, user-mode-linux-devel
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>
Index: linux-2.6.12/arch/um/kernel/helper.c
===================================================================
--- linux-2.6.12.orig/arch/um/kernel/helper.c 2005-07-25 17:22:14.000000000 -0400
+++ linux-2.6.12/arch/um/kernel/helper.c 2005-07-26 16:01:52.000000000 -0400
@@ -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 @@
return(pid);
}
-int helper_wait(int pid, int block)
+int helper_wait(int pid)
{
int ret;
@@ -160,14 +161,3 @@
}
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:
- */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-07-26 20:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-07-26 20:04 [PATCH 4/4] UML - Fix misdeclared function Jeff Dike
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®