diff options
| author |   Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:27:07 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:06 -0700 |
| commit | 18badddaa84e13e126f4ca5df47ac55b97a2635a (patch) | |
| tree | c57bee27c8144481a59546fcbd8487d9486c6a54 /arch/um/kernel | |
| parent | uml: fold mmu_context_skas into mm_context (diff) | |
| download | linux-dev-18badddaa84e13e126f4ca5df47ac55b97a2635a.tar.xz linux-dev-18badddaa84e13e126f4ca5df47ac55b97a2635a.zip | |
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>
Diffstat (limited to 'arch/um/kernel')
| -rw-r--r-- | arch/um/kernel/process.c | 4 | ||||
| -rw-r--r-- | arch/um/kernel/skas/syscall.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 7c037fa9c5b8..8a6882dfba01 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -201,9 +201,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, if (current->thread.forking) { memcpy(&p->thread.regs.regs, ®s->regs, sizeof(p->thread.regs.regs)); - REGS_SET_SYSCALL_RETURN(p->thread.regs.regs.regs, 0); + REGS_SET_SYSCALL_RETURN(p->thread.regs.regs.gp, 0); if (sp != 0) - REGS_SP(p->thread.regs.regs.regs) = sp; + REGS_SP(p->thread.regs.regs.gp) = sp; handler = fork_handler; diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c index 8582c1331048..50b476f2b38d 100644 --- a/arch/um/kernel/skas/syscall.c +++ b/arch/um/kernel/skas/syscall.c @@ -34,7 +34,7 @@ void handle_syscall(struct uml_pt_regs *r) result = -ENOSYS; else result = EXECUTE_SYSCALL(syscall, regs); - REGS_SET_SYSCALL_RETURN(r->regs, result); + REGS_SET_SYSCALL_RETURN(r->gp, result); syscall_trace(r, 1); } |