[src/trunk]: src/sys/arch/arm/arm32 Supersections are on armv6 too.

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

details:   https://anonhg.NetBSD.org/src/rev/a6790d71a71b
branches:  trunk
changeset: 781374:a6790d71a71b
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Sep 02 14:46:38 2012 +0000

description:
Supersections are on armv6 too.

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  6 +++---
 sys/arch/arm/arm32/pmap.c    |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r d5ae2bedffe9 -r a6790d71a71b sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Sun Sep 02 14:43:21 2012 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Sun Sep 02 14:46:38 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.55 2012/09/02 14:43:21 matt Exp $        */
+/*     $NetBSD: bus_dma.c,v 1.56 2012/09/02 14:46:38 matt Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #define _ARM32_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.55 2012/09/02 14:43:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.56 2012/09/02 14:46:38 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -970,7 +970,7 @@
                        if (__predict_false(pmap_pde_section(pde))) {
                                paddr_t s_frame = L1_S_FRAME;
                                paddr_t s_offset = L1_S_OFFSET;
-#if ARM_MMU_V7 > 0
+#if (ARM_MMU_V6 + ARM_MMU_V7) > 0
                                if (__predict_false(pmap_pde_supersection(pde))) {
                                        s_frame = L1_SS_FRAME;
                                        s_frame = L1_SS_OFFSET;
diff -r d5ae2bedffe9 -r a6790d71a71b sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Sun Sep 02 14:43:21 2012 +0000
+++ b/sys/arch/arm/arm32/pmap.c Sun Sep 02 14:46:38 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.235 2012/08/30 02:05:56 matt Exp $  */
+/*     $NetBSD: pmap.c,v 1.236 2012/09/02 14:46:38 matt Exp $  */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -212,7 +212,7 @@
 #include <arm/cpuconf.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.235 2012/08/30 02:05:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.236 2012/09/02 14:46:38 matt Exp $");
 
 #ifdef PMAP_DEBUG
 
@@ -5738,7 +5738,7 @@
        size = resid;
 
        while (resid > 0) {
-#ifdef _ARM_ARCH_6
+#if (ARM_MMU_V6 + ARM_MMU_V7) > 0
                /* See if we can use a supersection mapping. */
                if (L1_SS_PROTO && L1_SS_MAPPABLE_P(va, pa, resid)) {
                        /* Supersection are always domain 0 */