[src/trunk]: src/sys/arch/x86 Fix Xen kernel builds (pmap_is_curpmap can't be...

[tls <tls%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ade10c1e8547
branches:  trunk
changeset: 766009:ade10c1e8547
user:      tls <tls%NetBSD.org@localhost>
date:      Mon Jun 13 04:30:40 2011 +0000

description:
Fix Xen kernel builds (pmap_is_curpmap can't be static)

diffstat:

 sys/arch/x86/include/pmap.h |  4 +++-
 sys/arch/x86/x86/pmap.c     |  7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 4e61ce559cd9 -r ade10c1e8547 sys/arch/x86/include/pmap.h
--- a/sys/arch/x86/include/pmap.h       Mon Jun 13 03:42:15 2011 +0000
+++ b/sys/arch/x86/include/pmap.h       Mon Jun 13 04:30:40 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.39 2011/06/12 03:35:50 rmind Exp $  */
+/*     $NetBSD: pmap.h,v 1.40 2011/06/13 04:30:40 tls Exp $    */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -243,6 +243,8 @@
 
 u_int          x86_mmap_flags(paddr_t);
 
+bool           pmap_is_curpmap(struct pmap *);
+
 vaddr_t reserve_dumppages(vaddr_t); /* XXX: not a pmap fn */
 
 typedef enum tlbwhy {
diff -r 4e61ce559cd9 -r ade10c1e8547 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Mon Jun 13 03:42:15 2011 +0000
+++ b/sys/arch/x86/x86/pmap.c   Mon Jun 13 04:30:40 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.122 2011/06/12 03:35:50 rmind Exp $ */
+/*     $NetBSD: pmap.c,v 1.123 2011/06/13 04:30:40 tls Exp $   */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.122 2011/06/12 03:35:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.123 2011/06/13 04:30:40 tls Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -564,7 +564,6 @@
 static void             pmap_free_ptp(struct pmap *, struct vm_page *,
                                       vaddr_t, pt_entry_t *,
                                       pd_entry_t * const *);
-static bool             pmap_is_curpmap(struct pmap *);
 static bool             pmap_is_active(struct pmap *, struct cpu_info *, bool);
 static bool             pmap_remove_pte(struct pmap *, struct vm_page *,
                                         pt_entry_t *, vaddr_t,
@@ -676,7 +675,7 @@
  *             of course the kernel is always loaded
  */
 
-inline static bool
+bool
 pmap_is_curpmap(struct pmap *pmap)
 {
 #if defined(XEN) && defined(__x86_64__)