summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/slirp_user.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-02-04 22:31:10 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 09:44:30 -0800
commit1aa351a308d2c3ddb92b6cc45083fc54271d0010 (patch)
tree8694809fe286285fa4afbacd5d69e9097d5baf62 /arch/um/drivers/slirp_user.c
parentfce8c41c9f68b9af36f3076bae8f1d469a6e7aab (diff)
downloadlinux-1aa351a308d2c3ddb92b6cc45083fc54271d0010.tar.gz
linux-1aa351a308d2c3ddb92b6cc45083fc54271d0010.tar.bz2
linux-1aa351a308d2c3ddb92b6cc45083fc54271d0010.zip
uml: tidy helper code
Style fixes to arch/um/os/helper.c and tidying up the breakpoint fix a bit. helper.c gets all the usual style fixes - updated copyright all printks get severities Also - errval changes to err in helper_child fixed an obsolete comment run_helper was killing a child process which is guaranteed to be dead or dying anyway Removed the nohang and pname arguments from helper_wait and fixed the declaration and callers. nohang was used only in the slirp driver and I don't think it was needed. I think pname was a bit of overkill in putting out an error message when something goes wrong. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers/slirp_user.c')
-rw-r--r--arch/um/drivers/slirp_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index 89c1be225fda..a0ada8fec72a 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -98,7 +98,7 @@ static void slirp_close(int fd, void *data)
"(%d)\n", pri->pid, errno);
}
#endif
- err = helper_wait(pri->pid, 1, "slirp_close");
+ err = helper_wait(pri->pid);
if (err < 0)
return;