uml: remove code made redundant by CHOOSE_MODE removal
This patch makes a number of simplifications enabled by the removal of CHOOSE_MODE. There were lots of functions that looked like int foo(args){ foo_skas(args); } The bodies of foo_skas are now folded into foo, and their declarations (and sometimes entire header files) are deleted. In addition, the union uml_pt_regs, which was a union between the tt and skas register formats, is now a struct, with the tt-mode arm of the union being removed. It turns out that usr2_handler was unused, so it is gone. 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>
This commit is contained in:

committed by
Linus Torvalds

parent
ae2587e412
commit
77bf440031
@@ -128,7 +128,7 @@ static void bad_segv(struct faultinfo fi, unsigned long ip)
|
||||
force_sig_info(SIGSEGV, &si, current);
|
||||
}
|
||||
|
||||
static void segv_handler(int sig, union uml_pt_regs *regs)
|
||||
static void segv_handler(int sig, struct uml_pt_regs *regs)
|
||||
{
|
||||
struct faultinfo * fi = UPT_FAULTINFO(regs);
|
||||
|
||||
@@ -146,7 +146,7 @@ static void segv_handler(int sig, union uml_pt_regs *regs)
|
||||
* give us bad data!
|
||||
*/
|
||||
unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
|
||||
union uml_pt_regs *regs)
|
||||
struct uml_pt_regs *regs)
|
||||
{
|
||||
struct siginfo si;
|
||||
void *catcher;
|
||||
@@ -214,7 +214,7 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
|
||||
return 0;
|
||||
}
|
||||
|
||||
void relay_signal(int sig, union uml_pt_regs *regs)
|
||||
void relay_signal(int sig, struct uml_pt_regs *regs)
|
||||
{
|
||||
if (arch_handle_signal(sig, regs))
|
||||
return;
|
||||
@@ -230,14 +230,14 @@ void relay_signal(int sig, union uml_pt_regs *regs)
|
||||
force_sig(sig, current);
|
||||
}
|
||||
|
||||
static void bus_handler(int sig, union uml_pt_regs *regs)
|
||||
static void bus_handler(int sig, struct uml_pt_regs *regs)
|
||||
{
|
||||
if (current->thread.fault_catcher != NULL)
|
||||
do_longjmp(current->thread.fault_catcher, 1);
|
||||
else relay_signal(sig, regs);
|
||||
}
|
||||
|
||||
static void winch(int sig, union uml_pt_regs *regs)
|
||||
static void winch(int sig, struct uml_pt_regs *regs)
|
||||
{
|
||||
do_IRQ(WINCH_IRQ, regs);
|
||||
}
|
||||
|
Reference in New Issue
Block a user