Module Name: src
Committed By: tls
Date: Mon Jun 13 04:30:40 UTC 2011
Modified Files:
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: pmap.c
Log Message:
Fix Xen kernel builds (pmap_is_curpmap can't be static)
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/x86/x86/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/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.39 src/sys/arch/x86/include/pmap.h:1.40
--- src/sys/arch/x86/include/pmap.h:1.39 Sun Jun 12 03:35:50 2011
+++ src/sys/arch/x86/include/pmap.h Mon Jun 13 04:30:40 2011
@@ -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 {
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.122 src/sys/arch/x86/x86/pmap.c:1.123
--- src/sys/arch/x86/x86/pmap.c:1.122 Sun Jun 12 03:35:50 2011
+++ src/sys/arch/x86/x86/pmap.c Mon Jun 13 04:30:40 2011
@@ -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__)
