Module Name: src
Committed By: matt
Date: Thu Jul 5 17:25:36 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke: booke_pmap.c trap.c
Log Message:
s/seg_tab/seg_ptr/
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/booke/trap.c
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/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.13 src/sys/arch/powerpc/booke/booke_pmap.c:1.14
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.13 Thu Mar 29 15:48:20 2012
+++ src/sys/arch/powerpc/booke/booke_pmap.c Thu Jul 5 17:25:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_pmap.c,v 1.13 2012/03/29 15:48:20 matt Exp $ */
+/* $NetBSD: booke_pmap.c,v 1.14 2012/07/05 17:25:36 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.13 2012/03/29 15:48:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.14 2012/07/05 17:25:36 matt Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
@@ -126,7 +126,7 @@ pmap_md_direct_mapped_vaddr_to_paddr(vad
static pt_entry_t *
kvtopte(const struct pmap_segtab *stp, vaddr_t va)
{
- pt_entry_t * const ptep = stp->seg_tab[va >> SEGSHIFT];
+ pt_entry_t * const ptep = stp->seg_ptr[va >> SEGSHIFT];
if (ptep == NULL)
return NULL;
return &ptep[(va & SEGOFSET) >> PAGE_SHIFT];
@@ -226,7 +226,7 @@ pmap_bootstrap(vaddr_t startkernel, vadd
* an extra page for the segment table and allows the user/kernel
* access to be common.
*/
- pt_entry_t **ptp = &stp->seg_tab[VM_MIN_KERNEL_ADDRESS >> SEGSHIFT];
+ void **ptp = &stp->seg_ptr[VM_MIN_KERNEL_ADDRESS >> SEGSHIFT];
pt_entry_t *ptep = (void *)kv_segtabs;
memset(ptep, 0, NBPG * kv_nsegtabs);
for (size_t i = 0; i < kv_nsegtabs; i++, ptep += NPTEPG) {
@@ -244,7 +244,7 @@ pmap_bootstrap(vaddr_t startkernel, vadd
avail[0].size -= NBPG * dm_nsegtabs;
endkernel += NBPG * dm_nsegtabs;
- ptp = stp->seg_tab;
+ ptp = stp->seg_ptr;
ptep = (void *)dm_segtabs;
memset(ptep, 0, NBPG * dm_nsegtabs);
for (size_t i = 0; i < dm_nsegtabs; i++, ptp++, ptep += NPTEPG) {
Index: src/sys/arch/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.15 src/sys/arch/powerpc/booke/trap.c:1.16
--- src/sys/arch/powerpc/booke/trap.c:1.15 Thu May 17 16:22:38 2012
+++ src/sys/arch/powerpc/booke/trap.c Thu Jul 5 17:25:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.15 2012/05/17 16:22:38 matt Exp $ */
+/* $NetBSD: trap.c,v 1.16 2012/07/05 17:25:36 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.15 2012/05/17 16:22:38 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.16 2012/07/05 17:25:36 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,7 +148,7 @@ trap_pte_lookup(struct trapframe *tf, va
struct pmap_segtab * const stp = stps[(tf->tf_srr1 / psl_mask) & 1];
if (__predict_false(stp == NULL))
return NULL;
- pt_entry_t *ptep = stp->seg_tab[va >> SEGSHIFT];
+ pt_entry_t * const ptep = stp->seg_ptr[va >> SEGSHIFT];
if (__predict_false(ptep == NULL))
return NULL;
return ptep + ((va & SEGOFSET) >> PAGE_SHIFT);
