diff options
Diffstat (limited to 'arch/um/kernel/helper.c')
-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 @@ | |||
13 | #include "user.h" | 13 | #include "user.h" |
14 | #include "kern_util.h" | 14 | #include "kern_util.h" |
15 | #include "user_util.h" | 15 | #include "user_util.h" |
16 | #include "helper.h" | ||
16 | #include "os.h" | 17 | #include "os.h" |
17 | 18 | ||
18 | struct helper_data { | 19 | struct helper_data { |
@@ -149,7 +150,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, | |||
149 | return(pid); | 150 | return(pid); |
150 | } | 151 | } |
151 | 152 | ||
152 | int helper_wait(int pid, int block) | 153 | int helper_wait(int pid) |
153 | { | 154 | { |
154 | int ret; | 155 | int ret; |
155 | 156 | ||
@@ -160,14 +161,3 @@ int helper_wait(int pid, int block) | |||
160 | } | 161 | } |
161 | return(ret); | 162 | return(ret); |
162 | } | 163 | } |
163 | |||
164 | /* | ||
165 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
166 | * Emacs will notice this stuff at the end of the file and automatically | ||
167 | * adjust the settings for this buffer only. This must remain at the end | ||
168 | * of the file. | ||
169 | * --------------------------------------------------------------------------- | ||
170 | * Local variables: | ||
171 | * c-file-style: "linux" | ||
172 | * End: | ||
173 | */ | ||