[src/trunk]: src/sys/arch/usermode pcb->errno to pcb->pcb_errno

[reinoud <reinoud%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/603723421fca
branches:  trunk
changeset: 769253:603723421fca
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sun Sep 04 21:01:39 2011 +0000

description:
pcb->errno to pcb->pcb_errno

diffstat:

 sys/arch/usermode/dev/cpu.c       |  8 ++++----
 sys/arch/usermode/include/pcb.h   |  4 ++--
 sys/arch/usermode/usermode/trap.c |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (89 lines):

diff -r ff16da6aa5cc -r 603723421fca sys/arch/usermode/dev/cpu.c
--- a/sys/arch/usermode/dev/cpu.c       Sun Sep 04 20:55:43 2011 +0000
+++ b/sys/arch/usermode/dev/cpu.c       Sun Sep 04 21:01:39 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.28 2011/09/04 20:54:52 reinoud Exp $ */
+/* $NetBSD: cpu.c,v 1.29 2011/09/04 21:01:39 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_cpu.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.28 2011/09/04 20:54:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.29 2011/09/04 21:01:39 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -188,14 +188,14 @@
        curlwp = newlwp;
 
        if (oldpcb) {
-               oldpcb->errno = thunk_geterrno();
+               oldpcb->pcb_errno = thunk_geterrno();
                if (thunk_swapcontext(&oldpcb->pcb_ucp, &newpcb->pcb_ucp))
                        panic("swapcontext failed");
        } else {
                if (thunk_setcontext(&newpcb->pcb_ucp))
                        panic("setcontext failed");
        }
-       thunk_seterrno(newpcb->errno);
+       thunk_seterrno(newpcb->pcb_errno);
 
 #ifdef CPU_DEBUG
        printf("cpu_switchto: returning %p (was %p)\n", ci->ci_stash, oldlwp);
diff -r ff16da6aa5cc -r 603723421fca sys/arch/usermode/include/pcb.h
--- a/sys/arch/usermode/include/pcb.h   Sun Sep 04 20:55:43 2011 +0000
+++ b/sys/arch/usermode/include/pcb.h   Sun Sep 04 21:01:39 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.9 2011/09/04 20:54:52 reinoud Exp $ */
+/* $NetBSD: pcb.h,v 1.10 2011/09/04 21:01:39 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -52,7 +52,7 @@
        struct trapframe pcb_tf;
        void *           pcb_onfault;           /* on fault handler */
 
-       int              errno;                 /* save/restore place */
+       int              pcb_errno;             /* save/restore place */
 };
 
 #endif /* !_ARCH_USERMODE_INCLUDE_PCB_H */
diff -r ff16da6aa5cc -r 603723421fca sys/arch/usermode/usermode/trap.c
--- a/sys/arch/usermode/usermode/trap.c Sun Sep 04 20:55:43 2011 +0000
+++ b/sys/arch/usermode/usermode/trap.c Sun Sep 04 21:01:39 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.22 2011/09/04 20:54:52 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.23 2011/09/04 21:01:39 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud%netbsd.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.22 2011/09/04 20:54:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.23 2011/09/04 21:01:39 reinoud Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -125,7 +125,7 @@
                onfault = pcb->pcb_onfault;
                vm = p->p_vmspace;
 
-               pcb->errno = thunk_geterrno();
+               pcb->pcb_errno = thunk_geterrno();
 #if 0
                va = (vaddr_t) info->si_addr;
                printf("mem trap lwp = %p pid = %d lid = %d, va = %p\n",
@@ -216,7 +216,7 @@
                        /* XXX HOWTO see arm/arm/syscall.c illegal instruction signal */
                }
 
-               thunk_seterrno(pcb->errno);
+               thunk_seterrno(pcb->pcb_errno);
        }
        if (recurse > 1)
                printf("leaving trap recursion level %d\n", recurse);