Module Name: src
Committed By: matt
Date: Sat Oct 6 02:58:39 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Fix a cut&paste error with supersections.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/arm/arm32/bus_dma.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.59 src/sys/arch/arm/arm32/bus_dma.c:1.60
--- src/sys/arch/arm/arm32/bus_dma.c:1.59 Sat Sep 22 01:48:50 2012
+++ src/sys/arch/arm/arm32/bus_dma.c Sat Oct 6 02:58:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.59 2012/09/22 01:48:50 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.60 2012/10/06 02:58:39 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.59 2012/09/22 01:48:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.60 2012/10/06 02:58:39 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1311,8 +1311,8 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
#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;
-}
+ s_offset = L1_SS_OFFSET;
+ }
#endif
curaddr = (*pde & s_frame) | (vaddr & s_offset);
if (*pde & L1_S_CACHE_MASK) {
