Module Name: src
Committed By: matt
Date: Mon Dec 10 01:37:31 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: arm32_machdep.c cpuswitch.S fault.c genassym.cf
vm_machdep.c
src/sys/arch/arm/include: pcb.h
Log Message:
Rename pcb_sp/PCB_SP to pcb_ksp/PCB_KSP so that ipsec.c will compile.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/arm/arm32/cpuswitch.S
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/arm/arm32/fault.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/arm/arm32/genassym.cf
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/arm/arm32/vm_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/include/pcb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.85 src/sys/arch/arm/arm32/arm32_machdep.c:1.86
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.85 Sat Oct 27 17:17:36 2012
+++ src/sys/arch/arm/arm32/arm32_machdep.c Mon Dec 10 01:37:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.85 2012/10/27 17:17:36 chs Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.86 2012/12/10 01:37:30 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.85 2012/10/27 17:17:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.86 2012/12/10 01:37:30 matt Exp $");
#include "opt_modular.h"
#include "opt_md.h"
@@ -268,8 +268,8 @@ cpu_startup(void)
struct lwp * const l = &lwp0;
struct pcb * const pcb = lwp_getpcb(l);
- pcb->pcb_sp = uvm_lwp_getuarea(l) + USPACE_SVC_STACK_TOP;
- lwp_settrapframe(l, (struct trapframe *)pcb->pcb_sp - 1);
+ pcb->pcb_ksp = uvm_lwp_getuarea(l) + USPACE_SVC_STACK_TOP;
+ lwp_settrapframe(l, (struct trapframe *)pcb->pcb_ksp - 1);
}
/*
Index: src/sys/arch/arm/arm32/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.74 src/sys/arch/arm/arm32/cpuswitch.S:1.75
--- src/sys/arch/arm/arm32/cpuswitch.S:1.74 Wed Dec 5 19:05:45 2012
+++ src/sys/arch/arm/arm32/cpuswitch.S Mon Dec 10 01:37:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.74 2012/12/05 19:05:45 matt Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.75 2012/12/10 01:37:30 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -89,7 +89,7 @@
#include <machine/asm.h>
#include <machine/cpu.h>
- RCSID("$NetBSD: cpuswitch.S,v 1.74 2012/12/05 19:05:45 matt Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.75 2012/12/10 01:37:30 matt Exp $")
/* LINTSTUB: include <sys/param.h> */
@@ -258,7 +258,7 @@ ENTRY(cpu_switchto)
ldr r10, [r7, #(PCB_R10)]
ldr r11, [r7, #(PCB_R11)]
ldr r12, [r7, #(PCB_R12)]
- ldr r13, [r7, #(PCB_SP)]
+ ldr r13, [r7, #(PCB_KSP)]
#elif defined(_ARM_ARCH_6)
ldrd r8, [r7, #(PCB_R8)]
ldrd r10, [r7, #(PCB_R10)]
@@ -430,7 +430,7 @@ ENTRY_NP(softint_switch)
mcr p15, 0, r4, c13, c0, 4 /* restore pinned lwp */
#endif
str r4, [r7, #(CI_CURLWP)] /* restore pinned lwp */
- ldr sp, [r2, #(PCB_SP)] /* now running on the old stack. */
+ ldr sp, [r2, #(PCB_KSP)] /* now running on the old stack. */
/* At this point we can allow IRQ's again. */
msr cpsr_c, r6
Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.86 src/sys/arch/arm/arm32/fault.c:1.87
--- src/sys/arch/arm/arm32/fault.c:1.86 Mon Nov 12 18:00:35 2012
+++ src/sys/arch/arm/arm32/fault.c Mon Dec 10 01:37:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.86 2012/11/12 18:00:35 skrll Exp $ */
+/* $NetBSD: fault.c,v 1.87 2012/12/10 01:37:30 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
#include "opt_kgdb.h"
#include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.86 2012/11/12 18:00:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.87 2012/12/10 01:37:30 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -642,7 +642,7 @@ dab_buserr(trapframe_t *tf, u_int fsr, u
* If the current trapframe is at the top of the kernel stack,
* the fault _must_ have come from user mode.
*/
- if (tf != ((trapframe_t *)pcb->pcb_sp) - 1) {
+ if (tf != ((trapframe_t *)pcb->pcb_ksp) - 1) {
/*
* Kernel mode. We're either about to die a
* spectacular death, or pcb_onfault will come
Index: src/sys/arch/arm/arm32/genassym.cf
diff -u src/sys/arch/arm/arm32/genassym.cf:1.56 src/sys/arch/arm/arm32/genassym.cf:1.57
--- src/sys/arch/arm/arm32/genassym.cf:1.56 Sun Oct 21 15:46:00 2012
+++ src/sys/arch/arm/arm32/genassym.cf Mon Dec 10 01:37:30 2012
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.56 2012/10/21 15:46:00 matt Exp $
+# $NetBSD: genassym.cf,v 1.57 2012/12/10 01:37:30 matt Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -130,7 +130,7 @@ define PCB_R9 offsetof(struct pcb, pcb
define PCB_R10 offsetof(struct pcb, pcb_un.un_32.pcb32_r10)
define PCB_R11 offsetof(struct pcb, pcb_un.un_32.pcb32_r11)
define PCB_R12 offsetof(struct pcb, pcb_un.un_32.pcb32_r12)
-define PCB_SP offsetof(struct pcb, pcb_un.un_32.pcb32_sp)
+define PCB_KSP offsetof(struct pcb, pcb_un.un_32.pcb32_sp)
define PCB_LR offsetof(struct pcb, pcb_un.un_32.pcb32_lr)
define PCB_PC offsetof(struct pcb, pcb_un.un_32.pcb32_pc)
define PCB_USER_PID_RW offsetof(struct pcb, pcb_un.un_32.pcb32_user_pid_rw)
Index: src/sys/arch/arm/arm32/vm_machdep.c
diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.62 src/sys/arch/arm/arm32/vm_machdep.c:1.63
--- src/sys/arch/arm/arm32/vm_machdep.c:1.62 Wed Dec 5 19:05:45 2012
+++ src/sys/arch/arm/arm32/vm_machdep.c Mon Dec 10 01:37:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.62 2012/12/05 19:05:45 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.63 2012/12/10 01:37:31 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.62 2012/12/05 19:05:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.63 2012/12/10 01:37:31 matt Exp $");
#include "opt_armfpe.h"
#include "opt_pmap_debug.h"
@@ -143,7 +143,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
* Note: this stack is not in use if we are forking from p1
*/
uv = uvm_lwp_getuarea(l2);
- pcb2->pcb_sp = uv + USPACE_SVC_STACK_TOP;
+ pcb2->pcb_ksp = uv + USPACE_SVC_STACK_TOP;
#ifdef STACKCHECKS
/* Fill the kernel stack with a known pattern */
@@ -160,7 +160,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
}
#endif /* PMAP_DEBUG */
- struct trapframe *tf = (struct trapframe *)pcb2->pcb_sp - 1;
+ struct trapframe *tf = (struct trapframe *)pcb2->pcb_ksp - 1;
lwp_settrapframe(l2, tf);
*tf = *lwp_trapframe(l1);
@@ -177,7 +177,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
sf->sf_r7 = PSR_USR32_MODE; /* for returning to userspace */
sf->sf_sp = (u_int)tf;
sf->sf_pc = (u_int)lwp_trampoline;
- pcb2->pcb_sp = (u_int)sf;
+ pcb2->pcb_ksp = (u_int)sf;
}
/*
Index: src/sys/arch/arm/include/pcb.h
diff -u src/sys/arch/arm/include/pcb.h:1.24 src/sys/arch/arm/include/pcb.h:1.25
--- src/sys/arch/arm/include/pcb.h:1.24 Thu Aug 16 17:35:01 2012
+++ src/sys/arch/arm/include/pcb.h Mon Dec 10 01:37:30 2012
@@ -71,7 +71,7 @@ struct pcb_arm32 {
#define pcb_cstate pcb_un.un_32.pcb32_cstate
#define pcb_user_pid_rw pcb_un.un_32.pcb32_user_pid_rw
#ifdef __PROG32
-#define pcb_sp pcb_un.un_32.pcb32_sp
+#define pcb_ksp pcb_un.un_32.pcb32_sp
#endif
struct pcb_arm26 {
@@ -79,7 +79,7 @@ struct pcb_arm26 {
};
#define pcb_sf pcb_un.un_26.pcb26_sf
#ifdef __PROG26
-#define pcb_sp pcb_sf.sf_r13
+#define pcb_ksp pcb_sf.sf_r13
#endif
/*
