[src/trunk]: src/sys/arch/powerpc/booke s/seg_tab/seg_ptr/

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

details:   https://anonhg.NetBSD.org/src/rev/4f7a95a2ddfb
branches:  trunk
changeset: 780004:4f7a95a2ddfb
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jul 05 17:25:36 2012 +0000

description:
s/seg_tab/seg_ptr/

diffstat:

 sys/arch/powerpc/booke/booke_pmap.c |  10 +++++-----
 sys/arch/powerpc/booke/trap.c       |   6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 283a8e68f8de -r 4f7a95a2ddfb sys/arch/powerpc/booke/booke_pmap.c
--- a/sys/arch/powerpc/booke/booke_pmap.c       Thu Jul 05 17:24:54 2012 +0000
+++ b/sys/arch/powerpc/booke/booke_pmap.c       Thu Jul 05 17:25:36 2012 +0000
@@ -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 @@
 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 @@
         * 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 @@
        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) {
diff -r 283a8e68f8de -r 4f7a95a2ddfb sys/arch/powerpc/booke/trap.c
--- a/sys/arch/powerpc/booke/trap.c     Thu Jul 05 17:24:54 2012 +0000
+++ b/sys/arch/powerpc/booke/trap.c     Thu Jul 05 17:25:36 2012 +0000
@@ -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 @@
        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);