uml: rename pt_regs general-purpose register file

Before the removal of tt mode, access to a register on the skas-mode side of a
pt_regs struct looked like pt_regs.regs.skas.regs.regs[FOO].  This was bad
enough, but it became pt_regs.regs.regs.regs[FOO] with the removal of the
union from the middle.  To get rid of the run of three "regs", the last field
is renamed to "gp".

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>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index a20d313c823e..8e96c6dc6c90 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -138,7 +138,7 @@ static void handle_trap(int pid, struct uml_pt_regs *regs,
         int err, status;
 
         /* Mark this as a syscall */
-        UPT_SYSCALL_NR(regs) = PT_SYSCALL_NR(regs->regs);
+        UPT_SYSCALL_NR(regs) = PT_SYSCALL_NR(regs->gp);
 
         if (!local_using_sysemu)
         {
@@ -352,7 +352,7 @@ void userspace(struct uml_pt_regs *regs)
 
                         /* Avoid -ERESTARTSYS handling in host */
                         if (PT_SYSCALL_NR_OFFSET != PT_SYSCALL_RET_OFFSET)
-                                PT_SYSCALL_NR(regs->regs) = -1;
+                                PT_SYSCALL_NR(regs->gp) = -1;
                 }
         }
 }