Module Name: src
Committed By: matt
Date: Sun Sep 2 14:46:38 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c pmap.c
Log Message:
Supersections are on armv6 too.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/arm/arm32/bus_dma.c
cvs rdiff -u -r1.235 -r1.236 src/sys/arch/arm/arm32/pmap.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/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.55 src/sys/arch/arm/arm32/bus_dma.c:1.56
--- src/sys/arch/arm/arm32/bus_dma.c:1.55 Sun Sep 2 14:43:21 2012
+++ src/sys/arch/arm/arm32/bus_dma.c Sun Sep 2 14:46:38 2012
@@ -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 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
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;
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.235 src/sys/arch/arm/arm32/pmap.c:1.236
--- src/sys/arch/arm/arm32/pmap.c:1.235 Thu Aug 30 02:05:56 2012
+++ src/sys/arch/arm/arm32/pmap.c Sun Sep 2 14:46:38 2012
@@ -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 @@ pmap_map_chunk(vaddr_t l1pt, vaddr_t va,
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 */
