diff options
| author | Kenneth D. Merry <ken@FreeBSD.org> | 2012-02-02 17:54:35 +0000 |
|---|---|---|
| committer | Kenneth D. Merry <ken@FreeBSD.org> | 2012-02-02 17:54:35 +0000 |
| commit | 048a50f3541c49334db25d52bbb7d216e1e7cb45 (patch) | |
| tree | f8a9ee3d2e2e3bf6b0da1885f3f00370ebc3ed87 /sys/i386/include/xen | |
| parent | ca5a2a70ab8f5f67e04c74ce0293c660d287cbfc (diff) | |
Notes
Diffstat (limited to 'sys/i386/include/xen')
| -rw-r--r-- | sys/i386/include/xen/xenpmap.h | 11 | ||||
| -rw-r--r-- | sys/i386/include/xen/xenvar.h | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/sys/i386/include/xen/xenpmap.h b/sys/i386/include/xen/xenpmap.h index 169e40884453..8287e723a7e9 100644 --- a/sys/i386/include/xen/xenpmap.h +++ b/sys/i386/include/xen/xenpmap.h @@ -232,15 +232,6 @@ phys_to_machine_mapping_valid(unsigned long pfn) return xen_phys_machine[pfn] != INVALID_P2M_ENTRY; } -#elif defined(XENHVM) - -#define set_phys_to_machine(pfn, mfn) ((void)0) -#define phys_to_machine_mapping_valid(pfn) (TRUE) - -#if !defined(PAE) -#define vtomach(va) pmap_kextract((vm_offset_t) (va)) -#endif - -#endif /* !XEN && !XENHVM */ +#endif /* !XEN */ #endif /* _XEN_XENPMAP_H_ */ diff --git a/sys/i386/include/xen/xenvar.h b/sys/i386/include/xen/xenvar.h index 365930a7960a..137984d2a598 100644 --- a/sys/i386/include/xen/xenvar.h +++ b/sys/i386/include/xen/xenvar.h @@ -106,9 +106,15 @@ void xen_destroy_contiguous_region(void * addr, int npages); #elif defined(XENHVM) +#if !defined(PAE) +#define vtomach(va) pmap_kextract((vm_offset_t) (va)) +#endif #define PFNTOMFN(pa) (pa) #define MFNTOPFN(ma) (ma) +#define set_phys_to_machine(pfn, mfn) ((void)0) +#define phys_to_machine_mapping_valid(pfn) (TRUE) + #endif /* !XEN && !XENHVM */ #endif |