[PATCH] uml: move libc-dependent utility procedures (4fef0c10) · Commits · 戴 / test

arch/um/drivers/fd.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		#include "user.h"
		#include "user_util.h"
		#include "chan_user.h"
		#include "os.h"

		struct fd_chan {
		int fd;

arch/um/include/os.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,8 @@ extern unsigned long long os_usecs(void);
		/* tt.c
		* for tt mode only (will be deleted in future...)
		*/
		extern void stop(void);
		extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
		extern int protect_memory(unsigned long addr, unsigned long len,
		int r, int w, int x, int must_succeed);
		extern void forward_pending_sigio(int target);
		@@ -235,4 +237,12 @@ extern int set_signals(int enable);
		extern void os_fill_handlinfo(struct kern_handlers h);
		extern void do_longjmp(void *p, int val);

		/* util.c */
		extern void stack_protections(unsigned long address);
		extern void task_protections(unsigned long address);
		extern int raw(int fd);
		extern void setup_machinename(char *machine_out);
		extern void setup_hostinfo(void);
		extern int setjmp_wrapper(void (proc)(void , void *), ...);

		#endif

arch/um/include/user_util.h

+0 −18

Original line number	Diff line number	Diff line
		@@ -44,10 +44,6 @@ extern unsigned long brk_start;
		extern int pty_output_sigio;
		extern int pty_close_sigio;

		extern void stop(void);
		extern void stack_protections(unsigned long address);
		extern void task_protections(unsigned long address);
		extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
		extern void add_signal_handler(int sig, void (handler)(int));
		extern int linux_main(int argc, char **argv);
		extern void set_cmdline(char *cmd);
		@@ -55,8 +51,6 @@ extern void input_cb(void (proc)(void ), void *arg, int arg_len);
		extern int get_pty(void);
		extern void *um_kmalloc(int size);
		extern int switcheroo(int fd, int prot, void from, void to, int size);
		extern void setup_machinename(char *machine_out);
		extern void setup_hostinfo(void);
		extern void do_exec(int old_pid, int new_pid);
		extern void tracer_panic(char *msg, ...);
		extern int detach(int pid, int sig);
		@@ -70,18 +64,6 @@ extern int cpu_feature(char what, char buf, int len);
		extern int arch_handle_signal(int sig, union uml_pt_regs *regs);
		extern int arch_fixup(unsigned long address, void *sc_ptr);
		extern void arch_init_thread(void);
		extern int setjmp_wrapper(void (proc)(void , void *), ...);
		extern int raw(int fd);

		#endif

		/*
		* 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:
		*/

arch/um/kernel/Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -10,8 +10,7 @@ obj-y = config.o exec_kern.o exitcode.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 smp.o syscall_kern.o sysrq.o time.o \
		time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o \
		user_util.o
		time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o

		obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
		obj-$(CONFIG_GPROF) += gprof_syms.o
		@@ -24,7 +23,7 @@ obj-$(CONFIG_MODE_SKAS) += skas/

		user-objs-$(CONFIG_TTY_LOG) += tty_log.o

		USER_OBJS := $(user-objs-y) config.o time.o tty_log.o user_util.o
		USER_OBJS := $(user-objs-y) config.o time.o tty_log.o

		include arch/um/scripts/Makefile.rules

arch/um/kernel/skas/uaccess.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		#include "asm/pgtable.h"
		#include "asm/uaccess.h"
		#include "kern_util.h"
		#include "user_util.h"
		#include "os.h"

		extern void um_virt_to_phys(struct task_struct task, unsigned long addr,
		pte_t *pte_out);

Admin message