Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53dd2b55 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: use correct SIGBUS handler 



BB noticed that we had the wrong bus error handler.

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 09b185a3

arch/um/kernel/trap.c

+9 −8
Original line number Diff line number Diff line
@@ -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)

{

}