Commit abaf6977 authored by Gennady Sharapov's avatar Gennady Sharapov Committed by Linus Torvalds
Browse files

[PATCH] uml: move libc-dependent skas process handling 



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

This moves all systemcalls from skas/process.c file under os-Linux dir and
join skas/process.c and skas/process_kern.c files.

Signed-off-by: default avatarGennady Sharapov <gennady.v.sharapov@intel.com>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f45d9fc9

arch/um/include/os.h

+19 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ extern void block_signals(void); 
extern void unblock_signals(void);

extern int get_signals(void);

extern int set_signals(int enable);

extern void os_usr1_signal(int on);



/* trap.c */

extern void os_fill_handlinfo(struct kern_handlers h);
@@ -272,4 +273,22 @@ extern int protect(struct mm_id * mm_idp, unsigned long addr, 
		   unsigned long len, int r, int w, int x, int done,

		   void **data);



/* skas/process.c */

extern int is_skas_winch(int pid, int fd, void *data);

extern int start_userspace(unsigned long stub_stack);

extern int copy_context_skas0(unsigned long stack, int pid);

extern void userspace(union uml_pt_regs *regs);

extern void map_stub_pages(int fd, unsigned long code,

			   unsigned long data, unsigned long stack);

extern void new_thread(void *stack, void **switch_buf_ptr,

			 void **fork_buf_ptr, void (*handler)(int));

extern void thread_wait(void *sw, void *fb);

extern void switch_threads(void *me, void *next);

extern int start_idle_thread(void *stack, void *switch_buf_ptr,

			     void **fork_buf_ptr);

extern void initial_thread_cb_skas(void (*proc)(void *),

				 void *arg);

extern void halt_skas(void);

extern void reboot_skas(void);



#endif

arch/um/include/skas/mode-skas.h

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ extern unsigned long exec_fpx_regs[]; 
extern int have_fpx_regs;



extern void sig_handler_common_skas(int sig, void *sc_ptr);

extern void halt_skas(void);

extern void reboot_skas(void);

extern void kill_off_processes_skas(void);

extern int is_skas_winch(int pid, int fd, void *data);



#endif

arch/um/include/skas/mode_kern_skas.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ extern int copy_thread_skas(int nr, unsigned long clone_flags, 
			    unsigned long sp, unsigned long stack_top,

			    struct task_struct *p, struct pt_regs *regs);

extern void release_thread_skas(struct task_struct *task);

extern void initial_thread_cb_skas(void (*proc)(void *), void *arg);

extern void init_idle_skas(void);

extern void flush_tlb_kernel_range_skas(unsigned long start,

					unsigned long end);

arch/um/include/skas/skas.h

+0 −9
Original line number Diff line number Diff line
@@ -13,21 +13,12 @@ extern int userspace_pid[]; 
extern int proc_mm, ptrace_faultinfo, ptrace_ldt;

extern int skas_needs_stub;



extern void switch_threads(void *me, void *next);

extern void thread_wait(void *sw, void *fb);

extern void new_thread(void *stack, void **switch_buf_ptr, void **fork_buf_ptr,

		       void (*handler)(int));

extern int start_idle_thread(void *stack, void *switch_buf_ptr,

			     void **fork_buf_ptr);

extern int user_thread(unsigned long stack, int flags);

extern void userspace(union uml_pt_regs *regs);

extern void new_thread_proc(void *stack, void (*handler)(int sig));

extern void new_thread_handler(int sig);

extern void handle_syscall(union uml_pt_regs *regs);

extern void user_signal(int sig, union uml_pt_regs *regs, int pid);

extern int new_mm(unsigned long stack);

extern int start_userspace(unsigned long stub_stack);

extern int copy_context_skas0(unsigned long stack, int pid);

extern void get_skas_faultinfo(int pid, struct faultinfo * fi);

extern long execute_syscall_skas(void *r);

extern unsigned long current_stub_stack(void);

arch/um/kernel/skas/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
# Licensed under the GPL

#



obj-y := clone.o exec_kern.o mem.o mmu.o process.o process_kern.o \

obj-y := clone.o exec_kern.o mem.o mmu.o process_kern.o \

	syscall.o tlb.o uaccess.o



USER_OBJS := process.o clone.o

USER_OBJS := clone.o



include arch/um/scripts/Makefile.rules

CRA Git | Maintained and supported by SUSTech CRA and CCSE