Module Name: src
Committed By: jym
Date: Wed Nov 23 00:56:56 UTC 2011
Modified Files:
src/sys/arch/x86/include: pmap.h
src/sys/arch/xen/include: xenpmap.h
src/sys/arch/xen/x86: xen_pmap.c
Log Message:
Move Xen-specific functions to Xen pmap. Requested by cherry@.
Un'ifdef XEN in xen_pmap.c, it is always defined there.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/xen/include/xenpmap.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/xen/x86/xen_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.46 src/sys/arch/x86/include/pmap.h:1.47
--- src/sys/arch/x86/include/pmap.h:1.46 Sun Nov 20 19:41:27 2011
+++ src/sys/arch/x86/include/pmap.h Wed Nov 23 00:56:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.46 2011/11/20 19:41:27 jym Exp $ */
+/* $NetBSD: pmap.h,v 1.47 2011/11/23 00:56:56 jym Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -456,24 +456,14 @@ xpmap_update (pt_entry_t *pte, pt_entry_
splx(s);
}
-
/* Xen helpers to change bits of a pte */
#define XPMAP_UPDATE_DIRECT 1 /* Update direct map entry flags too */
paddr_t vtomach(vaddr_t);
#define vtomfn(va) (vtomach(va) >> PAGE_SHIFT)
-void pmap_xen_resume(void);
-void pmap_xen_suspend(void);
-
void pmap_apte_flush(struct pmap *);
void pmap_unmap_apdp(void);
-
-#ifdef PAE
-void pmap_map_recursive_entries(void);
-void pmap_unmap_recursive_entries(void);
-#endif /* PAE */
-
#endif /* XEN */
/* pmap functions with machine addresses */
Index: src/sys/arch/xen/include/xenpmap.h
diff -u src/sys/arch/xen/include/xenpmap.h:1.31 src/sys/arch/xen/include/xenpmap.h:1.32
--- src/sys/arch/xen/include/xenpmap.h:1.31 Tue Nov 8 17:16:52 2011
+++ src/sys/arch/xen/include/xenpmap.h Wed Nov 23 00:56:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenpmap.h,v 1.31 2011/11/08 17:16:52 cherry Exp $ */
+/* $NetBSD: xenpmap.h,v 1.32 2011/11/23 00:56:56 jym Exp $ */
/*
*
@@ -53,6 +53,13 @@ void xen_bcast_tlbflush(void);
void xen_mcast_invlpg(vaddr_t, uint32_t);
void xen_bcast_invlpg(vaddr_t);
+void pmap_xen_resume(void);
+void pmap_xen_suspend(void);
+
+#ifdef PAE
+void pmap_map_recursive_entries(void);
+void pmap_unmap_recursive_entries(void);
+#endif /* PAE */
#define xpq_queue_pin_l1_table(pa) \
xpq_queue_pin_table(pa, MMUEXT_PIN_L1_TABLE)
Index: src/sys/arch/xen/x86/xen_pmap.c
diff -u src/sys/arch/xen/x86/xen_pmap.c:1.9 src/sys/arch/xen/x86/xen_pmap.c:1.10
--- src/sys/arch/xen/x86/xen_pmap.c:1.9 Sun Nov 20 19:41:27 2011
+++ src/sys/arch/xen/x86/xen_pmap.c Wed Nov 23 00:56:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_pmap.c,v 1.9 2011/11/20 19:41:27 jym Exp $ */
+/* $NetBSD: xen_pmap.c,v 1.10 2011/11/23 00:56:56 jym Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.9 2011/11/20 19:41:27 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.10 2011/11/23 00:56:56 jym Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -137,10 +137,9 @@ __KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v
#include <x86/i82489reg.h>
#include <x86/i82489var.h>
-#ifdef XEN
#include <xen/xen3-public/xen.h>
#include <xen/hypervisor.h>
-#endif
+#include <xen/xenpmap.h>
#define COUNT(x) /* nothing */
