From 18badddaa84e13e126f4ca5df47ac55b97a2635a Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Tue, 16 Oct 2007 01:27:07 -0700 Subject: 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/os-Linux/registers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/um/os-Linux/registers.c') diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c index 14732f98e0a2..b06c780e8dba 100644 --- a/arch/um/os-Linux/registers.c +++ b/arch/um/os-Linux/registers.c @@ -16,14 +16,14 @@ static unsigned long exec_regs[MAX_REG_NR]; void init_thread_registers(struct uml_pt_regs *to) { - memcpy(to->regs, exec_regs, sizeof(to->regs)); + memcpy(to->gp, exec_regs, sizeof(to->gp)); } void save_registers(int pid, struct uml_pt_regs *regs) { int err; - err = ptrace(PTRACE_GETREGS, pid, 0, regs->regs); + err = ptrace(PTRACE_GETREGS, pid, 0, regs->gp); if (err < 0) panic("save_registers - saving registers failed, errno = %d\n", errno); @@ -33,7 +33,7 @@ void restore_registers(int pid, struct uml_pt_regs *regs) { int err; - err = ptrace(PTRACE_SETREGS, pid, 0, regs->regs); + err = ptrace(PTRACE_SETREGS, pid, 0, regs->gp); if (err < 0) panic("restore_registers - saving registers failed, " "errno = %d\n", errno); -- cgit v1.2.3