Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tls 2011-06-13 04:30:40 +00:00
parent e9b3916bd6
commit ceba797a83
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/x86/include/pmap.h
View File

@ -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 @@ int pmap_pdes_invalid(vaddr_t, pd_entry_t * const *, pd_entry_t *);
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 {

7
sys/arch/x86/x86/pmap.c
View File

@ -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_freepage(struct pmap *, struct vm_page *, int);
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 @@ pv_pte_next(struct pmap_page *pp, struct pv_pte *pvpte)
* of course the kernel is always loaded
*/
inline static bool
bool
pmap_is_curpmap(struct pmap *pmap)
{
#if defined(XEN) && defined(__x86_64__)