edea138584
Tidy kern_util.h. It turns out that most of the function declarations aren't used, so they can go away. os.h no longer includes kern_util.h, so files which got it through os.h now need to include it directly. A number of other files never needed it, so these includes are deleted. The structure which was used to pass signal handlers from the kernel side to the userspace side is gone. Instead, the handlers are declared here, and used directly from libc code. This allows arch/um/os-Linux/trap.c to be deleted, with its remnants being moved to arch/um/os-Linux/skas/trap.c. arch/um/os-Linux/tty.c had its inclusions changed, and it needed some style attention, so it got tidied. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
73 lines
1.8 KiB
C
73 lines
1.8 KiB
C
/*
|
|
* Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#include "sysdep/ptrace.h"
|
|
#include "kern_constants.h"
|
|
#include "as-layout.h"
|
|
#include "kern_util.h"
|
|
#include "os.h"
|
|
#include "sigcontext.h"
|
|
#include "task.h"
|
|
|
|
void (*sig_info[NSIG])(int, struct uml_pt_regs *) = {
|
|
[SIGTRAP] = relay_signal,
|
|
[SIGFPE] = relay_signal,
|
|
[SIGILL] = relay_signal,
|
|
[SIGWINCH] = winch,
|
|
[SIGBUS] = bus_handler,
|
|
[SIGSEGV] = segv_handler,
|
|
[SIGIO] = sigio_handler,
|
|
[SIGVTALRM] = timer_handler };
|
|
|
|
static struct uml_pt_regs ksig_regs[UM_NR_CPUS];
|
|
|
|
void sig_handler_common_skas(int sig, void *sc_ptr)
|
|
{
|
|
struct sigcontext *sc = sc_ptr;
|
|
struct uml_pt_regs *r;
|
|
void (*handler)(int, struct uml_pt_regs *);
|
|
int save_user, save_errno = errno;
|
|
|
|
/*
|
|
* This is done because to allow SIGSEGV to be delivered inside a SEGV
|
|
* handler. This can happen in copy_user, and if SEGV is disabled,
|
|
* the process will die.
|
|
* XXX Figure out why this is better than SA_NODEFER
|
|
*/
|
|
if (sig == SIGSEGV) {
|
|
change_sig(SIGSEGV, 1);
|
|
/*
|
|
* For segfaults, we want the data from the
|
|
* sigcontext. In this case, we don't want to mangle
|
|
* the process registers, so use a static set of
|
|
* registers. For other signals, the process
|
|
* registers are OK.
|
|
*/
|
|
r = &ksig_regs[cpu()];
|
|
copy_sc(r, sc_ptr);
|
|
}
|
|
else r = TASK_REGS(get_current());
|
|
|
|
save_user = r->is_user;
|
|
r->is_user = 0;
|
|
if ((sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS) ||
|
|
(sig == SIGILL) || (sig == SIGTRAP))
|
|
GET_FAULTINFO_FROM_SC(r->faultinfo, sc);
|
|
|
|
change_sig(SIGUSR1, 1);
|
|
|
|
handler = sig_info[sig];
|
|
|
|
/* unblock SIGVTALRM, SIGIO if sig isn't IRQ signal */
|
|
if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGVTALRM))
|
|
unblock_signals();
|
|
|
|
handler(sig, r);
|
|
|
|
errno = save_errno;
|
|
r->is_user = save_user;
|
|
}
|