Module Name: src Committed By: skrll Date: Wed Apr 2 15:35:14 UTC 2014
Modified Files: src/sys/arch/arm/arm32: pmap.c Log Message: Fix non-DIAGNOSTIC build To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 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/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.278 src/sys/arch/arm/arm32/pmap.c:1.279 --- src/sys/arch/arm/arm32/pmap.c:1.278 Wed Apr 2 14:05:54 2014 +++ src/sys/arch/arm/arm32/pmap.c Wed Apr 2 15:35:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.278 2014/04/02 14:05:54 matt Exp $ */ +/* $NetBSD: pmap.c,v 1.279 2014/04/02 15:35:14 skrll Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -216,7 +216,7 @@ #include <arm/locore.h> //#include <arm/arm32/katelib.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.278 2014/04/02 14:05:54 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.279 2014/04/02 15:35:14 skrll Exp $"); //#define PMAP_DEBUG #ifdef PMAP_DEBUG @@ -3667,7 +3667,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v PMAPCOUNT(kenter_remappings); #ifdef PMAP_CACHE_VIPT opg = PHYS_TO_VM_PAGE(l2pte_pa(opte)); -#ifdef DIAGNOSTIC +#if !defined(ARM_MMU_EXTENDED) || defined(DIAGNOSTIC) struct vm_page_md *omd = VM_PAGE_TO_MD(opg); #endif if (opg && arm_cache_prefer_mask != 0) {