UML - Move libc-dependent code from signal_user.c
PATCH 1/4 UML - Move libc-dependent code from signal_user.c
From: Gennady Sharapov <[email protected]>
The serial UML OS-abstraction layer patch (um/kernel dir).
This moves all systemcalls from signal_user.c file under os-Linux dir
arch/um/include/kern_util.h +0 -2
@@ -51,8 +51,6 @@ extern void timer_handler(int sig, unionextern int set_signals (int enable);extern void force_sigbus (void );extern int pid_to_processor_id (int pid); -extern void block_signals (void ); -extern void unblock_signals (void );extern void deliver_signals (void *t);extern int next_syscall_index (int max);extern int next_trap_index (int max);
arch/um/include/os.h +10 -0
@@ -219,4 +219,14 @@ extern int umid_file_name(char *name, chextern int set_umid (char *name);extern char *get_umid (void ); +/* signal.c */ +extern void set_sigstack (void *sig_stack,int size); +extern void remove_sigstack (void ); +extern void set_handler (int sig,void (*handler)(int ),int flags, ...); +extern int change_sig (int signal,int on); +extern void block_signals (void ); +extern void unblock_signals (void ); +extern int get_signals (void ); +extern int set_signals (int enable); +#endif
arch/um/include/signal_user.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* -* Copyright (C) 2001 Jeff Dike ([email protected]) -* Licensed under the GPL -*/ - -#ifndef __SIGNAL_USER_H__ -#define __SIGNAL_USER_H__ - -extern int signal_stack_size; - -extern int change_sig (int signal,int on); -extern void set_sigstack (void *stack,int size); -extern void set_handler (int sig,void (*handler)(int ),int flags, ...); -extern int set_signals (int enable); -extern int get_signals (void ); - -#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 +1 -1
@@ -9,7 +9,7 @@ clean-files := 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 signal_user.o smp.o syscall_kern.o sysrq.o time.o \ + signal_kern.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 umid.o \ user_util.o
arch/um/kernel/irq_user.c +0 -1
@@ -15,7 +15,6 @@#include "kern_util.h" #include "user.h" #include "process.h" -#include "signal_user.h" #include "sigio.h" #include "irq_user.h" #include "os.h"
arch/um/kernel/process_kern.c +0 -1
@@ -36,7 +36,6 @@#include "kern_util.h" #include "kern.h" #include "signal_kern.h" -#include "signal_user.h" #include "init.h" #include "irq_user.h" #include "mem_user.h"
arch/um/kernel/signal_kern.c +0 -1
@@ -22,7 +22,6 @@#include "asm/ucontext.h" #include "kern_util.h" #include "signal_kern.h" -#include "signal_user.h" #include "kern.h" #include "frame_kern.h" #include "sigcontext.h"
arch/um/kernel/signal_user.c deleted +0 -157
157 lines not on this page · raw message
arch/um/kernel/skas/include/skas.h +0 -1
@@ -22,7 +22,6 @@ extern int start_idle_thread(void *stackextern 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 remove_sigstack (void );extern void new_thread_handler (int sig);extern void handle_syscall (union uml_pt_regs *regs); extern int map(struct mm_id * mm_idp, unsigned long virt,
arch/um/kernel/skas/process.c +0 -11
@@ -31,7 +31,6 @@#include "proc_mm.h" #include "skas_ptrace.h" #include "chan_user.h" -#include "signal_user.h" #include "registers.h" #include "mem.h" #include "uml-config.h"
@@ -514,16 +513,6 @@ int start_idle_thread(void *stack, voidsiglongjmp (**switch_buf,1 ); } -void remove_sigstack (void ) -{ -stack_t stack = ((stack_t ) { .ss_flags =SS_DISABLE , - .ss_sp =NULL , - .ss_size =0 }); - -if (sigaltstack (&stack,NULL ) !=0 ) -panic ("disabling signal stack failed, errno = %d\n" , errno); -} -void initial_thread_cb_skas (void (*proc)(void *),void *arg) {sigjmp_buf here;
arch/um/kernel/skas/process_kern.c +0 -1
@@ -14,7 +14,6 @@#include "asm/atomic.h" #include "kern_util.h" #include "time_user.h" -#include "signal_user.h" #include "skas.h" #include "os.h" #include "user_util.h"
arch/um/kernel/skas/trap_user.c +1 -1
@@ -5,7 +5,6 @@#include <signal.h> #include <errno.h> -#include "signal_user.h" #include "user_util.h" #include "kern_util.h" #include "task.h"
@@ -14,6 +13,7 @@#include "ptrace_user.h" #include "sysdep/ptrace.h" #include "sysdep/ptrace_user.h" +#include "os.h" void sig_handler_common_skas (int sig,void *sc_ptr) {
arch/um/kernel/time.c +1 -1
@@ -14,9 +14,9 @@#include "kern_util.h" #include "user.h" #include "process.h" -#include "signal_user.h" #include "time_user.h" #include "kern_constants.h" +#include "os.h" /* XXX This really needs to be declared and initialized in a kernel file since * it's in <linux/time.h>
arch/um/kernel/trap_user.c +0 -1
@@ -17,7 +17,6 @@#include "sigcontext.h" #include "sysdep/sigcontext.h" #include "irq_user.h" -#include "signal_user.h" #include "time_user.h" #include "task.h" #include "mode.h"
arch/um/kernel/tt/exec_kern.c +0 -1
@@ -14,7 +14,6 @@#include "kern_util.h" #include "irq_user.h" #include "time_user.h" -#include "signal_user.h" #include "mem_user.h" #include "os.h" #include "tlb.h"
arch/um/kernel/tt/process_kern.c +0 -1
@@ -13,7 +13,6 @@#include "asm/ptrace.h" #include "asm/tlbflush.h" #include "irq_user.h" -#include "signal_user.h" #include "kern_util.h" #include "user_util.h" #include "os.h"
arch/um/kernel/tt/tracer.c +0 -1
@@ -19,7 +19,6 @@#include "sigcontext.h" #include "sysdep/sigcontext.h" #include "os.h" -#include "signal_user.h" #include "user_util.h" #include "mem_user.h" #include "process.h"
arch/um/kernel/tt/trap_user.c +1 -1
@@ -8,11 +8,11 @@#include <signal.h> #include "sysdep/ptrace.h" #include "sysdep/sigcontext.h" -#include "signal_user.h" #include "user_util.h" #include "kern_util.h" #include "task.h" #include "tt.h" +#include "os.h" void sig_handler_common_tt (int sig,void *sc_ptr) {
arch/um/os-Linux/main.c +0 -1
@@ -16,7 +16,6 @@#include "user_util.h" #include "kern_util.h" #include "mem_user.h" -#include "signal_user.h" #include "time_user.h" #include "irq_user.h" #include "user.h"
arch/um/os-Linux/process.c +0 -1
@@ -15,7 +15,6 @@#include "os.h" #include "user.h" #include "user_util.h" -#include "signal_user.h" #include "process.h" #include "irq_user.h" #include "kern_util.h"
arch/um/os-Linux/signal.c +148 -10
170 lines not on this page · raw message
arch/um/os-Linux/start_up.c +0 -1
@@ -24,7 +24,6 @@#include "kern_util.h" #include "user.h" #include "signal_kern.h" -#include "signal_user.h" #include "sysdep/ptrace.h" #include "sysdep/sigcontext.h" #include "irq_user.h"
arch/um/os-Linux/tt.c +0 -1
@@ -23,7 +23,6 @@#include "kern_util.h" #include "user.h" #include "signal_kern.h" -#include "signal_user.h" #include "sysdep/ptrace.h" #include "sysdep/sigcontext.h" #include "irq_user.h"
arch/um/sys-i386/signal.c +0 -1
@@ -10,7 +10,6 @@#include "asm/uaccess.h" #include "asm/unistd.h" #include "frame_kern.h" -#include "signal_user.h" #include "sigcontext.h" #include "registers.h" #include "mode.h"
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel