From 512b6fb1c14d4c34f23a3419b0789ad01914a899 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Tue, 16 Oct 2007 01:27:11 -0700 Subject: uml: userspace files should call libc directly A number of files that were changed in the recent removal of tt mode are userspace files which call the os_* wrappers instead of calling libc directly. A few other files were affected by this, through This patch makes these call glibc directly. There are also style fixes in the affected areas. os_print_error has no remaining callers, so it is deleted. There is a interface change to os_set_exec_close, eliminating a parameter which was always the same. The callers are fixed as well. os_process_pc got its error path cleaned up. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/os-Linux/start_up.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/um/os-Linux/start_up.c') diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index c5c36dbe819b..7b81f6c08a5e 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c @@ -28,13 +28,14 @@ static int ptrace_child(void) { int ret; + /* Calling os_getpid because some libcs cached getpid incorrectly */ int pid = os_getpid(), ppid = getppid(); int sc_result; change_sig(SIGWINCH, 0); if (ptrace(PTRACE_TRACEME, 0, 0, 0) < 0) { perror("ptrace"); - os_kill_process(pid, 0); + kill(pid, SIGKILL); } kill(pid, SIGSTOP); @@ -496,7 +497,7 @@ int __init parse_iomem(char *str, int *add) file++; fd = open(file, O_RDWR, 0); if (fd < 0) { - os_print_error(fd, "parse_iomem - Couldn't open io file"); + perror("parse_iomem - Couldn't open io file"); goto out; } -- cgit v1.2.3