[PATCH] uml: separate libc-dependent helper code

The serial UML OS-abstraction layer patch (um/kernel dir).

This moves all systemcalls from helper.c file under os-Linux dir

Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5 files changed, 2 insertions, 171 deletions

diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index f9858583863..3de9d21e36b 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := vmlinux.lds
 clean-files :=
 
 obj-y = config.o exec_kern.o exitcode.o \
-	helper.o init_task.o irq.o irq_user.o ksyms.o mem.o physmem.o \
+	init_task.o irq.o irq_user.o ksyms.o mem.o physmem.o \
 	process_kern.o ptrace.o reboot.o resource.o sigio_user.o sigio_kern.o \
 	signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o time.o \
 	time_kern.o tlb.o trap_kern.o trap_user.o uaccess.o um_arch.o \
@@ -24,8 +24,7 @@ obj-$(CONFIG_MODE_SKAS) += skas/
 
 user-objs-$(CONFIG_TTY_LOG) += tty_log.o
 
-USER_OBJS := $(user-objs-y) config.o helper.o time.o tty_log.o umid.o \
-	user_util.o
+USER_OBJS := $(user-objs-y) config.o time.o tty_log.o umid.o user_util.o
 
 include arch/um/scripts/Makefile.rules
 
diff --git a/arch/um/kernel/helper.c b/arch/um/kernel/helper.c
deleted file mode 100644
index 33fb0bd3b11..00000000000
--- a/arch/um/kernel/helper.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sched.h>
-#include <sys/signal.h>
-#include <sys/wait.h>
-#include "user.h"
-#include "kern_util.h"
-#include "user_util.h"
-#include "helper.h"
-#include "os.h"
-
-struct helper_data {
-	void (*pre_exec)(void*);
-	void *pre_data;
-	char **argv;
-	int fd;
-};
-
-/* Debugging aid, changed only from gdb */
-int helper_pause = 0;
-
-static void helper_hup(int sig)
-{
-}
-
-static int helper_child(void *arg)
-{
-	struct helper_data *data = arg;
-	char **argv = data->argv;
-	int errval;
-
-	if(helper_pause){
-		signal(SIGHUP, helper_hup);
-		pause();
-	}
-	if(data->pre_exec != NULL)
-		(*data->pre_exec)(data->pre_data);
-	execvp(argv[0], argv);
-	errval = errno;
-	printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
-	os_write_file(data->fd, &errval, sizeof(errval));
-	os_kill_process(os_getpid(), 0);
-	return(0);
-}
-
-/* Returns either the pid of the child process we run or -E* on failure.
- * XXX The alloc_stack here breaks if this is called in the tracing thread */
-int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
-	       unsigned long *stack_out)
-{
-	struct helper_data data;
-	unsigned long stack, sp;
-	int pid, fds[2], ret, n;
-
-	if((stack_out != NULL) && (*stack_out != 0))
-		stack = *stack_out;
-	else stack = alloc_stack(0, um_in_interrupt());
-	if(stack == 0)
-		return(-ENOMEM);
-
-	ret = os_pipe(fds, 1, 0);
-	if(ret < 0){
-		printk("run_helper : pipe failed, ret = %d\n", -ret);
-		goto out_free;
-	}
-
-	ret = os_set_exec_close(fds[1], 1);
-	if(ret < 0){
-		printk("run_helper : setting FD_CLOEXEC failed, ret = %d\n",
-		       -ret);
-		goto out_close;
-	}
-
-	sp = stack + page_size() - sizeof(void *);
-	data.pre_exec = pre_exec;
-	data.pre_data = pre_data;
-	data.argv = argv;
-	data.fd = fds[1];
-	pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data);
-	if(pid < 0){
-		ret = -errno;
-		printk("run_helper : clone failed, errno = %d\n", errno);
-		goto out_close;
-	}
-
-	os_close_file(fds[1]);
-	fds[1] = -1;
-
-	/*Read the errno value from the child.*/
-	n = os_read_file(fds[0], &ret, sizeof(ret));
-	if(n < 0){
-		printk("run_helper : read on pipe failed, ret = %d\n", -n);
-		ret = n;
-		os_kill_process(pid, 1);
-	}
-	else if(n != 0){
-		CATCH_EINTR(n = waitpid(pid, NULL, 0));
-		ret = -errno;
-	} else {
-		ret = pid;
-	}
-
-out_close:
-	if (fds[1] != -1)
-		os_close_file(fds[1]);
-	os_close_file(fds[0]);
-out_free:
-	if(stack_out == NULL)
-		free_stack(stack, 0);
-	else *stack_out = stack;
-	return(ret);
-}
-
-int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, 
-		      unsigned long *stack_out, int stack_order)
-{
-	unsigned long stack, sp;
-	int pid, status, err;
-
-	stack = alloc_stack(stack_order, um_in_interrupt());
-	if(stack == 0) return(-ENOMEM);
-
-	sp = stack + (page_size() << stack_order) - sizeof(void *);
-	pid = clone(proc, (void *) sp, flags | SIGCHLD, arg);
-	if(pid < 0){
-		err = -errno;
-		printk("run_helper_thread : clone failed, errno = %d\n", 
-		       errno);
-		return err;
-	}
-	if(stack_out == NULL){
-		CATCH_EINTR(pid = waitpid(pid, &status, 0));
-		if(pid < 0){
-			err = -errno;
-			printk("run_helper_thread - wait failed, errno = %d\n",
-			       errno);
-			pid = err;
-		}
-		if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
-			printk("run_helper_thread - thread returned status "
-			       "0x%x\n", status);
-		free_stack(stack, stack_order);
-	}
-	else *stack_out = stack;
-	return(pid);
-}
-
-int helper_wait(int pid)
-{
-	int ret;
-
-	CATCH_EINTR(ret = waitpid(pid, NULL, WNOHANG));
-	if(ret < 0){
-		ret = -errno;
-		printk("helper_wait : waitpid failed, errno = %d\n", errno);
-	}
-	return(ret);
-}
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index a97a72e516a..7713e7a6f47 100644
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -20,7 +20,6 @@
 #include "user_util.h"
 #include "mem_user.h"
 #include "os.h"
-#include "helper.h"
 
 EXPORT_SYMBOL(stop);
 EXPORT_SYMBOL(uml_physmem);
diff --git a/arch/um/kernel/sigio_user.c b/arch/um/kernel/sigio_user.c
index a52751108aa..3fbfd956bfe 100644
--- a/arch/um/kernel/sigio_user.c
+++ b/arch/um/kernel/sigio_user.c
@@ -18,7 +18,6 @@
 #include "kern_util.h"
 #include "user_util.h"
 #include "sigio.h"
-#include "helper.h"
 #include "os.h"
 
 /* Changed during early boot */
diff --git a/arch/um/kernel/user_util.c b/arch/um/kernel/user_util.c
index 41d17c71511..4c231161f25 100644
--- a/arch/um/kernel/user_util.c
+++ b/arch/um/kernel/user_util.c
@@ -27,7 +27,6 @@
 #include "user.h"
 #include "mem_user.h"
 #include "init.h"
-#include "helper.h"
 #include "ptrace_user.h"
 #include "uml-config.h"