diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-08-17 23:39:22 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-08-17 23:39:22 +0000 |
| commit | 3b5571f59f7cf9b93ed1fde376d9c77bbe2dea1d (patch) | |
| tree | 3256e004d78437a84ce12f47fbf77e07a7b69774 /sys/i386/include | |
| parent | e1f1ab616ed766fe721ba84a62d1a96863196e0a (diff) | |
| download | FreeBSD-src-3b5571f59f7cf9b93ed1fde376d9c77bbe2dea1d.zip FreeBSD-src-3b5571f59f7cf9b93ed1fde376d9c77bbe2dea1d.tar.gz | |
Ensure that machine / physical addresses are treated as vm_paddr_t
MFC after: 1 month
Diffstat (limited to 'sys/i386/include')
| -rw-r--r-- | sys/i386/include/xen/xenfunc.h | 2 | ||||
| -rw-r--r-- | sys/i386/include/xen/xenvar.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/i386/include/xen/xenfunc.h b/sys/i386/include/xen/xenfunc.h index 9a34f0e..533b10c 100644 --- a/sys/i386/include/xen/xenfunc.h +++ b/sys/i386/include/xen/xenfunc.h @@ -57,7 +57,7 @@ char *xen_setbootenv(char *cmd_line); int xen_boothowto(char *envp); -void _xen_machphys_update(unsigned long, unsigned long, char *file, int line); +void _xen_machphys_update(vm_paddr_t, vm_paddr_t, char *file, int line); #ifdef INVARIANTS #define xen_machphys_update(a, b) _xen_machphys_update((a), (b), __FILE__, __LINE__) diff --git a/sys/i386/include/xen/xenvar.h b/sys/i386/include/xen/xenvar.h index e160523..779a540 100644 --- a/sys/i386/include/xen/xenvar.h +++ b/sys/i386/include/xen/xenvar.h @@ -69,8 +69,8 @@ extern xen_pfn_t *xen_machine_phys; #endif -#define PFNTOMFN(i) (xen_phys_machine[((xen_pfn_t)i)]) -#define MFNTOPFN(i) (xen_machine_phys[((xen_pfn_t)i)]) +#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) @@ -81,8 +81,8 @@ extern xen_pfn_t *xen_machine_phys; #define VTOMFN(va) (vtomach(va) >> PAGE_SHIFT) #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) -#define phystomach(pa) (PFNTOMFN((pa) >> PAGE_SHIFT) << PAGE_SHIFT) -#define machtophys(ma) (MFNTOPFN((ma) >> PAGE_SHIFT) << PAGE_SHIFT) +#define phystomach(pa) (((vm_paddr_t)(PFNTOMFN((pa) >> PAGE_SHIFT))) << PAGE_SHIFT) +#define machtophys(ma) (((vm_paddr_t)(MFNTOPFN((ma) >> PAGE_SHIFT))) << PAGE_SHIFT) void xpq_init(void); |
