From 9e947685e3b41bafefd2db3e11b7fc4893011a47 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Wed, 27 Jul 2005 11:43:33 -0700
Subject: [PATCH] --- yaml --- r: 5104 b: refs/heads/master c:
 0d4579ed553e8bb29d580c08bfcabcb0826a89c3 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/arch/um/kernel/helper.c | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 54bae7372a45..6f89f21711af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20a64f1d70a1a9cc001f2fec5ba1b0a4ff3f6bd5
+refs/heads/master: 0d4579ed553e8bb29d580c08bfcabcb0826a89c3
diff --git a/trunk/arch/um/kernel/helper.c b/trunk/arch/um/kernel/helper.c
index 13b1f5c2f7ee..f83e1e8e2392 100644
--- a/trunk/arch/um/kernel/helper.c
+++ b/trunk/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:
- */