diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-09-25 07:01:31 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-09-25 07:01:31 +0000 |
| commit | ba5a88198a11cf10ef7006738e2a99e94993e7d3 (patch) | |
| tree | 451d5f5304549dc85c7c3b468c2df4e1b2176041 /sys/xen/gnttab.c | |
| parent | 7ed2245e3e156c78830bab862e09656891eea415 (diff) | |
| download | FreeBSD-src-ba5a88198a11cf10ef7006738e2a99e94993e7d3.zip FreeBSD-src-ba5a88198a11cf10ef7006738e2a99e94993e7d3.tar.gz | |
partial update to interface headers to 3.2
MFC after: 1 month
Diffstat (limited to 'sys/xen/gnttab.c')
| -rw-r--r-- | sys/xen/gnttab.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/xen/gnttab.c b/sys/xen/gnttab.c index fd45322..14aa5fc 100644 --- a/sys/xen/gnttab.c +++ b/sys/xen/gnttab.c @@ -15,6 +15,7 @@ __FBSDID("$FreeBSD$"); #include "opt_global.h" #include "opt_pmap.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -30,15 +31,12 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_page.h> #include <vm/vm_kern.h> - - #include <machine/xen/hypervisor.h> #include <machine/xen/synch_bitops.h> #include <xen/gnttab.h> #define cmpxchg(a, b, c) atomic_cmpset_int((volatile u_int *)(a),(b),(c)) - #if 1 #define ASSERT(_p) \ if ( !(_p) ) { printk("Assertion '%s': line %d, file %s\n", \ @@ -463,7 +461,11 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx) { struct gnttab_setup_table setup; - unsigned long *frames; +#ifdef __LP64__ + uint64_t *frames; +#else + uint32_t *frames; +#endif unsigned int nr_gframes = end_idx + 1; int i, rc; |
