Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/arm32 Fix a cut&paste error with supersections.
details: https://anonhg.NetBSD.org/src/rev/24752d7b7dce
branches: trunk
changeset: 781904:24752d7b7dce
user: matt <matt%NetBSD.org@localhost>
date: Sat Oct 06 02:58:39 2012 +0000
description:
Fix a cut&paste error with supersections.
diffstat:
sys/arch/arm/arm32/bus_dma.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (29 lines):
diff -r a1040962a933 -r 24752d7b7dce sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c Sat Oct 06 01:30:46 2012 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c Sat Oct 06 02:58:39 2012 +0000
@@ -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 @@
#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) {
Home |
Main Index |
Thread Index |
Old Index