PERFORCE change 132228 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=132228

Change 132228 by kmacy at pandemonium:kmacy:xen31 on 2008/01/01 06:32:35

	update interface for replicating page directory updates to the 
	shadow page directory

Affected files ...

.. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#5 edit

Differences ...

==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#5 (text+ko) ====

@@ -82,7 +82,7 @@
 #define SH_PD_SET_VA_CLEAR  3
 
 struct pmap;
-void pd_set(struct pmap *pmap, vm_paddr_t *ptr, vm_paddr_t val, int type);
+void pd_set(struct pmap *pmap, int ptepindex, vm_paddr_t val, int type);
 #ifdef notyet
 static vm_paddr_t
 vptetomachpte(vm_paddr_t *pte)
@@ -158,19 +158,19 @@
 		xen_flush_queue();				\
 } while (/*CONSTCOND*/0)
 
-#define PD_SET_VA(_pmap, _ptp,_npte,sync) do {			\
+#define PD_SET_VA(_pmap, _ptepindex,_npte,sync) do {		\
         PMAP_REF((_ptp), xpmap_ptom(_npte));                    \
-        pd_set((_pmap),(_ptp),(_npte), SH_PD_SET_VA);           \
+        pd_set((_pmap),(_ptepindex),(_npte), SH_PD_SET_VA);     \
 	if (sync || ALWAYS_SYNC) xen_flush_queue();     	\
 } while (/*CONSTCOND*/0)
-#define PD_SET_VA_MA(_pmap, _ptp,_npte,sync) do {		\
+#define PD_SET_VA_MA(_pmap, _ptepindex,_npte,sync) do {		\
         PMAP_REF((_ptp), (_npte));                              \
-        pd_set((_pmap),(_ptp),(_npte), SH_PD_SET_VA_MA);        \
+        pd_set((_pmap),(_ptepindex),(_npte), SH_PD_SET_VA_MA);  \
 	if (sync || ALWAYS_SYNC) xen_flush_queue();		\
 } while (/*CONSTCOND*/0)
-#define PD_CLEAR_VA(_pmap, _ptp, sync) do {			\
+#define PD_CLEAR_VA(_pmap, _ptepindex, sync) do {		\
         PMAP_REF((pt_entry_t *)(_ptp), 0);                      \
-        pd_set((_pmap),(_ptp), 0, SH_PD_SET_VA_CLEAR);          \
+        pd_set((_pmap),(_ptepindex), 0, SH_PD_SET_VA_CLEAR);    \
 	if (sync || ALWAYS_SYNC) xen_flush_queue();		\
 } while (/*CONSTCOND*/0)
 
@@ -207,13 +207,13 @@
 static __inline vm_paddr_t
 xpmap_mtop(vm_paddr_t mpa)
 {
-    return machtophys(mpa) | (mpa & ~PG_FRAME);
+    return machtophys(mpa) | (mpa & PAGE_MASK);
 }
 
 static __inline vm_paddr_t
 xpmap_ptom(vm_paddr_t ppa)
 {
-    return phystomach(ppa) | (ppa & ~PG_FRAME);
+    return phystomach(ppa) | (ppa & PAGE_MASK);
 }
 
 #endif /* _XEN_XENPMAP_H_ */