Module Name: src Committed By: matt Date: Wed Dec 12 15:09:37 UTC 2012
Modified Files: src/sys/arch/arm/include/arm32: pmap.h Log Message: Protect more definitions with #ifndef _LOCORE To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/arch/arm/include/arm32/pmap.h 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/include/arm32/pmap.h diff -u src/sys/arch/arm/include/arm32/pmap.h:1.118 src/sys/arch/arm/include/arm32/pmap.h:1.119 --- src/sys/arch/arm/include/arm32/pmap.h:1.118 Wed Dec 12 00:29:17 2012 +++ src/sys/arch/arm/include/arm32/pmap.h Wed Dec 12 15:09:37 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.118 2012/12/12 00:29:17 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.119 2012/12/12 15:09:37 matt Exp $ */ /* * Copyright (c) 2002, 2003 Wasabi Systems, Inc. @@ -890,6 +890,7 @@ extern void (*pmap_zero_page_func)(paddr #define L2_L_MAPPABLE_P(va, pa, size) \ ((((va) | (pa)) & L2_L_OFFSET) == 0 && (size) >= L2_L_SIZE) +#ifndef _LOCORE /* * Hooks for the pool allocator. */ @@ -906,8 +907,6 @@ struct vm_page *arm_pmap_alloc_poolpage( ((paddr_t)((vaddr_t)(va) - KERNEL_BASE + physical_start)) #endif -#ifndef _LOCORE - /* * pmap-specific data store in the vm_page structure. */