Skip to content

Commit

Permalink
[PATCH] uml: use correct SIGBUS handler
Browse files Browse the repository at this point in the history
BB noticed that we had the wrong bus error handler.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Sep 27, 2006
1 parent 09b185a commit 53dd2b5
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions arch/um/kernel/trap.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,6 @@ void segv_handler(int sig, union uml_pt_regs *regs)
segv(*fi, UPT_IP(regs), UPT_IS_USER(regs), regs);
}

const struct kern_handlers handlinfo_kern = {
.relay_signal = relay_signal,
.winch = winch,
.bus_handler = relay_signal,
.page_fault = segv_handler,
.sigio_handler = sigio_handler,
.timer_handler = timer_handler
};
/*
* We give a *copy* of the faultinfo in the regs to segv.
* This must be done, since nesting SEGVs could overwrite
Expand Down Expand Up @@ -253,6 +245,15 @@ void winch(int sig, union uml_pt_regs *regs)
do_IRQ(WINCH_IRQ, regs);
}

const struct kern_handlers handlinfo_kern = {
.relay_signal = relay_signal,
.winch = winch,
.bus_handler = bus_handler,
.page_fault = segv_handler,
.sigio_handler = sigio_handler,
.timer_handler = timer_handler
};

void trap_init(void)
{
}

0 comments on commit 53dd2b5

Please sign in to comment.