summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-09-27 01:50:37 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:26:16 -0700
commit53dd2b55c50c810073615c79816bc06aea02dba9 (patch)
tree7576ae7d1ab19701a20f6a906208526a69c4b697
parent09b185a3169c5a8f9b7baf97f16d32add7e10ca4 (diff)
downloadop-kernel-dev-53dd2b55c50c810073615c79816bc06aea02dba9.zip
op-kernel-dev-53dd2b55c50c810073615c79816bc06aea02dba9.tar.gz
[PATCH] uml: use correct SIGBUS handler
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>
-rw-r--r--arch/um/kernel/trap.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index e44ff6e..61a23ff 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -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
@@ -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)
{
}
OpenPOWER on IntegriCloud