Wed Feb 26 01:51:51 2014 UTC ()
Remove duplicate PMAP_PTE


(matt)
diff -r1.124 -r1.125 src/sys/arch/arm/include/arm32/pmap.h
cvs diff -r1.124 -r1.125 src/sys/arch/arm/include/arm32/pmap.h (expand / switch to unified diff)

--- src/sys/arch/arm/include/arm32/pmap.h 2014/02/26 01:45:33 1.124
+++ src/sys/arch/arm/include/arm32/pmap.h 2014/02/26 01:51:51 1.125
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pmap.h,v 1.124 2014/02/26 01:45:33 matt Exp $ */ 1/* $NetBSD: pmap.h,v 1.125 2014/02/26 01:51:51 matt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2002, 2003 Wasabi Systems, Inc. 4 * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Jason R. Thorpe & Steve C. Woodford for Wasabi Systems, Inc. 7 * Written by Jason R. Thorpe & Steve C. Woodford for Wasabi Systems, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -341,27 +341,26 @@ u_int arm32_mmap_flags(paddr_t); @@ -341,27 +341,26 @@ u_int arm32_mmap_flags(paddr_t);
341 341
342#define PMAP_PTE 0x10000000 /* kenter_pa */ 342#define PMAP_PTE 0x10000000 /* kenter_pa */
343 343
344/* 344/*
345 * Functions that we need to export 345 * Functions that we need to export
346 */ 346 */
347void pmap_procwr(struct proc *, vaddr_t, int); 347void pmap_procwr(struct proc *, vaddr_t, int);
348void pmap_remove_all(pmap_t); 348void pmap_remove_all(pmap_t);
349bool pmap_extract(pmap_t, vaddr_t, paddr_t *); 349bool pmap_extract(pmap_t, vaddr_t, paddr_t *);
350 350
351#define PMAP_NEED_PROCWR 351#define PMAP_NEED_PROCWR
352#define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */ 352#define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */
353#define PMAP_ENABLE_PMAP_KMPAGE /* enable the PMAP_KMPAGE flag */ 353#define PMAP_ENABLE_PMAP_KMPAGE /* enable the PMAP_KMPAGE flag */
354#define PMAP_PTE 0x01000000 /* Use PTE cache settings */ 
355 354
356#if (ARM_MMU_V6 + ARM_MMU_V7) > 0 355#if (ARM_MMU_V6 + ARM_MMU_V7) > 0
357#define PMAP_PREFER(hint, vap, sz, td) pmap_prefer((hint), (vap), (td)) 356#define PMAP_PREFER(hint, vap, sz, td) pmap_prefer((hint), (vap), (td))
358void pmap_prefer(vaddr_t, vaddr_t *, int); 357void pmap_prefer(vaddr_t, vaddr_t *, int);
359#endif 358#endif
360 359
361void pmap_icache_sync_range(pmap_t, vaddr_t, vaddr_t); 360void pmap_icache_sync_range(pmap_t, vaddr_t, vaddr_t);
362 361
363/* Functions we use internally. */ 362/* Functions we use internally. */
364#ifdef PMAP_STEAL_MEMORY 363#ifdef PMAP_STEAL_MEMORY
365void pmap_boot_pagealloc(psize_t, psize_t, psize_t, pv_addr_t *); 364void pmap_boot_pagealloc(psize_t, psize_t, psize_t, pv_addr_t *);
366void pmap_boot_pageadd(pv_addr_t *); 365void pmap_boot_pageadd(pv_addr_t *);
367vaddr_t pmap_steal_memory(vsize_t, vaddr_t *, vaddr_t *); 366vaddr_t pmap_steal_memory(vsize_t, vaddr_t *, vaddr_t *);