Module Name: src
Committed By: matt
Date: Thu Apr 7 10:03:47 UTC 2011
Modified Files:
src/sys/arch/arm/arm32: cpuswitch.S genassym.cf
Log Message:
Fetch user read-only thread and process id from l->l_private, not the pcb.
(need to g/c the pcb field formerly used for this).
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/arm/arm32/cpuswitch.S
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/arm/arm32/genassym.cf
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/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.62 src/sys/arch/arm/arm32/cpuswitch.S:1.63
--- src/sys/arch/arm/arm32/cpuswitch.S:1.62 Tue Feb 1 01:20:14 2011
+++ src/sys/arch/arm/arm32/cpuswitch.S Thu Apr 7 10:03:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.62 2011/02/01 01:20:14 matt Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.63 2011/04/07 10:03:47 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.62 2011/02/01 01:20:14 matt Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.63 2011/04/07 10:03:47 matt Exp $")
/* LINTSTUB: include <sys/param.h> */
@@ -258,7 +258,7 @@
*/
ldr r0, [r7, #(PCB_USER_PID_RW)]
mcr p15, 0, r0, c13, c0, 2
- ldr r0, [r7, #(PCB_USER_PID_RO)]
+ ldr r0, [r6, #(L_PRIVATE)]
mcr p15, 0, r0, c13, c0, 3
#endif
Index: src/sys/arch/arm/arm32/genassym.cf
diff -u src/sys/arch/arm/arm32/genassym.cf:1.45 src/sys/arch/arm/arm32/genassym.cf:1.46
--- src/sys/arch/arm/arm32/genassym.cf:1.45 Mon Jan 31 06:26:54 2011
+++ src/sys/arch/arm/arm32/genassym.cf Thu Apr 7 10:03:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.45 2011/01/31 06:26:54 matt Exp $
+# $NetBSD: genassym.cf,v 1.46 2011/04/07 10:03:47 matt Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -108,6 +108,7 @@
define L_STAT offsetof(struct lwp, l_stat)
define L_PROC offsetof(struct lwp, l_proc)
define L_CTXSWTCH offsetof(struct lwp, l_ctxswtch)
+define L_PRIVATE offsetof(struct lwp, l_private)
define P_RASLIST offsetof(struct proc, p_raslist)
define PCB_TF offsetof(struct pcb, pcb_tf)
@@ -121,7 +122,6 @@
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)
-define PCB_USER_PID_RO offsetof(struct pcb, pcb_un.un_32.pcb32_user_pid_ro)
define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
define PCB_NOALIGNFLT PCB_NOALIGNFLT
