Module Name: src
Committed By: matt
Date: Sat Feb 2 14:06:58 UTC 2013
Modified Files:
src/sys/uvm: uvm_pmap.h
Log Message:
Remove __BEGIN_DECLS/__END_DECLS
Allow pmap_kenter_pa to be a macro.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/uvm/uvm_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/uvm/uvm_pmap.h
diff -u src/sys/uvm/uvm_pmap.h:1.37 src/sys/uvm/uvm_pmap.h:1.38
--- src/sys/uvm/uvm_pmap.h:1.37 Thu Jun 30 00:49:14 2011
+++ src/sys/uvm/uvm_pmap.h Sat Feb 2 14:06:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pmap.h,v 1.37 2011/06/30 00:49:14 matt Exp $ */
+/* $NetBSD: uvm_pmap.h,v 1.38 2013/02/02 14:06:58 matt Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -137,7 +137,6 @@ extern struct pmap *const kernel_pmap_pt
#ifndef PMAP_EXCLUDE_DECLS /* Used in Sparc port to virtualize pmap mod */
#ifdef _KERNEL
-__BEGIN_DECLS
void pmap_activate(struct lwp *);
void pmap_deactivate(struct lwp *);
void pmap_unwire(pmap_t, vaddr_t);
@@ -165,7 +164,9 @@ vaddr_t pmap_growkernel(vaddr_t);
void pmap_init(void);
+#if !defined(pmap_kenter_pa)
void pmap_kenter_pa(vaddr_t, paddr_t, vm_prot_t, u_int);
+#endif
void pmap_kremove(vaddr_t, vsize_t);
#if !defined(pmap_is_modified)
bool pmap_is_modified(struct vm_page *);
@@ -211,7 +212,6 @@ vaddr_t pmap_steal_memory(vsize_t, vadd
#if defined(PMAP_FORK)
void pmap_fork(pmap_t, pmap_t);
#endif
-__END_DECLS
#endif /* kernel*/
#endif /* PMAP_EXCLUDE_DECLS */
