summaryrefslogtreecommitdiffstats
path: root/sys/i386/include/xen
diff options
context:
space:
mode:
authorkmacy <kmacy@FreeBSD.org>2008-09-10 07:11:08 +0000
committerkmacy <kmacy@FreeBSD.org>2008-09-10 07:11:08 +0000
commite3882f36083324c0d0c64ec0c9c6da6fb061ff78 (patch)
tree870848c20d88f26564e15790dfdae6a9fbf378cc /sys/i386/include/xen
parent977bb41a581a18041a2937f601ff6c3f0ec32b1f (diff)
downloadFreeBSD-src-e3882f36083324c0d0c64ec0c9c6da6fb061ff78.zip
FreeBSD-src-e3882f36083324c0d0c64ec0c9c6da6fb061ff78.tar.gz
Get initial bootstrap of APs working under xen.
Note that the APs still blow up in sched_throw(). MFC after: 1 month
Diffstat (limited to 'sys/i386/include/xen')
-rw-r--r--sys/i386/include/xen/xenpmap.h2
-rw-r--r--sys/i386/include/xen/xenvar.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/include/xen/xenpmap.h b/sys/i386/include/xen/xenpmap.h
index eb1f157..17d1f92 100644
--- a/sys/i386/include/xen/xenpmap.h
+++ b/sys/i386/include/xen/xenpmap.h
@@ -184,7 +184,7 @@ vptetomachpte(vm_paddr_t *pte)
do { \
PANIC_IF(HYPERVISOR_update_va_mapping(((unsigned long)(_va)),\
(_ma), \
- UVMF_INVLPG| UVMF_LOCAL) < 0); \
+ UVMF_INVLPG| UVMF_ALL) < 0); \
} while (/*CONSTCOND*/0)
#define PT_UPDATES_FLUSH() do { \
diff --git a/sys/i386/include/xen/xenvar.h b/sys/i386/include/xen/xenvar.h
index 779a540..402bc8a 100644
--- a/sys/i386/include/xen/xenvar.h
+++ b/sys/i386/include/xen/xenvar.h
@@ -72,8 +72,8 @@ extern xen_pfn_t *xen_machine_phys;
#define PFNTOMFN(i) (xen_phys_machine[(i)])
#define MFNTOPFN(i) ((vm_paddr_t)xen_machine_phys[(i)])
-#define VTOP(x) ((uintptr_t)(((uint8_t *)(x)) - KERNBASE))
-#define PTOV(x) ((x) + KERNBASE)
+#define VTOP(x) ((((uintptr_t)(x))) - KERNBASE)
+#define PTOV(x) (((uintptr_t)(x)) + KERNBASE)
#define VTOPFN(x) (VTOP(x) >> PAGE_SHIFT)
#define PFNTOV(x) PTOV((vm_paddr_t)(x) << PAGE_SHIFT)
OpenPOWER on IntegriCloud