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>

3 files changed, 19 insertions, 23 deletions

diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index 383052baa166..ae7685710c46 100644
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -294,7 +294,3 @@ int protect(struct mm_id * mm_idp, unsigned long addr, unsigned long len,
 
         return ret;
 }
-
-void before_mem_skas(unsigned long unused)
-{
-}
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index db020d21f132..eb027673f357 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -131,19 +131,19 @@ void get_skas_faultinfo(int pid, struct faultinfo * fi)
         }
 }
 
-static void handle_segv(int pid, union uml_pt_regs * regs)
+static void handle_segv(int pid, struct uml_pt_regs * regs)
 {
-        get_skas_faultinfo(pid, &regs->skas.faultinfo);
-        segv(regs->skas.faultinfo, 0, 1, NULL);
+        get_skas_faultinfo(pid, &regs->faultinfo);
+        segv(regs->faultinfo, 0, 1, NULL);
 }
 
 /*To use the same value of using_sysemu as the caller, ask it that value (in local_using_sysemu)*/
-static void handle_trap(int pid, union uml_pt_regs *regs, int local_using_sysemu)
+static void handle_trap(int pid, struct uml_pt_regs *regs, int local_using_sysemu)
 {
         int err, status;
 
         /* Mark this as a syscall */
-        UPT_SYSCALL_NR(regs) = PT_SYSCALL_NR(regs->skas.regs);
+        UPT_SYSCALL_NR(regs) = PT_SYSCALL_NR(regs->regs);
 
         if (!local_using_sysemu)
         {
@@ -286,7 +286,7 @@ int start_userspace(unsigned long stub_stack)
         return(pid);
 }
 
-void userspace(union uml_pt_regs *regs)
+void userspace(struct uml_pt_regs *regs)
 {
         int err, status, op, pid = userspace_pid[0];
         /* To prevent races if using_sysemu changes under us.*/
@@ -312,7 +312,7 @@ void userspace(union uml_pt_regs *regs)
                         panic("userspace - waitpid failed, errno = %d\n",
                               errno);
 
-                regs->skas.is_user = 1;
+                regs->is_user = 1;
                 save_registers(pid, regs);
                 UPT_SYSCALL_NR(regs) = -1; /* Assume: It's not a syscall */
 
@@ -321,7 +321,7 @@ void userspace(union uml_pt_regs *regs)
                         switch(sig){
                         case SIGSEGV:
                                 if(PTRACE_FULL_FAULTINFO || !ptrace_faultinfo){
-                                        get_skas_faultinfo(pid, &regs->skas.faultinfo);
+                                        get_skas_faultinfo(pid, &regs->faultinfo);
                                         (*sig_info[SIGSEGV])(SIGSEGV, regs);
                                 }
                                 else handle_segv(pid, regs);
@@ -351,7 +351,7 @@ void userspace(union uml_pt_regs *regs)
 
                         /* Avoid -ERESTARTSYS handling in host */
                         if(PT_SYSCALL_NR_OFFSET != PT_SYSCALL_RET_OFFSET)
-                                PT_SYSCALL_NR(regs->skas.regs) = -1;
+                                PT_SYSCALL_NR(regs->regs) = -1;
                 }
         }
 }
@@ -578,16 +578,16 @@ void reboot_skas(void)
         UML_LONGJMP(&initial_jmpbuf, INIT_JMP_REBOOT);
 }
 
-void switch_mm_skas(struct mm_id *mm_idp)
+void __switch_mm(struct mm_id *mm_idp)
 {
         int err;
 
-        /* FIXME: need cpu pid in switch_mm_skas */
+        /* FIXME: need cpu pid in __switch_mm */
         if(proc_mm){
                 err = ptrace(PTRACE_SWITCH_MM, userspace_pid[0], 0,
                              mm_idp->u.mm_fd);
                 if(err)
-                        panic("switch_mm_skas - PTRACE_SWITCH_MM failed, "
+                        panic("__switch_mm - PTRACE_SWITCH_MM failed, "
                               "errno = %d\n", errno);
         }
         else userspace_pid[0] = mm_idp->u.pid;
diff --git a/arch/um/os-Linux/skas/trap.c b/arch/um/os-Linux/skas/trap.c
index 3b600c2e63b8..d43e470227de 100644
--- a/arch/um/os-Linux/skas/trap.c
+++ b/arch/um/os-Linux/skas/trap.c
@@ -15,13 +15,13 @@
 #include "sysdep/ptrace_user.h"
 #include "os.h"
 
-static union uml_pt_regs ksig_regs[UM_NR_CPUS];
+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;
-        union uml_pt_regs *r;
-        void (*handler)(int, union uml_pt_regs *);
+        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
@@ -42,12 +42,12 @@ void sig_handler_common_skas(int sig, void *sc_ptr)
         }
         else r = TASK_REGS(get_current());
 
-        save_user = r->skas.is_user;
-        r->skas.is_user = 0;
+        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->skas.faultinfo, sc);
+                GET_FAULTINFO_FROM_SC(r->faultinfo, sc);
         }
 
         change_sig(SIGUSR1, 1);
@@ -62,5 +62,5 @@ void sig_handler_common_skas(int sig, void *sc_ptr)
         handler(sig, r);
 
         errno = save_errno;
-        r->skas.is_user = save_user;
+        r->is_user = save_user;
 }