diff -r 4f6a2bbdff3f xen/common/xmalloc_tlsf.c --- a/xen/common/xmalloc_tlsf.c Tue Jan 13 15:53:47 2009 +0000 +++ b/xen/common/xmalloc_tlsf.c Thu Jan 15 10:42:03 2009 -0700 @@ -283,6 +283,39 @@ static inline void ADD_REGION(void *regi * TLSF pool-based allocator start. */ +#ifdef __x86_64__ +extern void free_domheap_pages(struct page_info *pg, unsigned int order); +extern struct page_info *alloc_domheap_pages( + struct domain *d, unsigned int order, unsigned int memflags); + +static inline void *alloc_xheap_pages(unsigned int order) +{ + struct page_info *pi = 0; + + if ((pi = alloc_domheap_pages(0,order,0)) == NULL) + return NULL; + return mfn_to_virt(page_to_mfn(pi)); +} + +static inline void free_xheap_pages(void *p, unsigned int order) +{ + free_domheap_pages(mfn_to_page(virt_to_mfn(p)),order); +} +#else +extern void free_xenheap_pages(void *p, unsigned int order); +extern void *alloc_xenheap_pages(unsigned int order); + +static inline void *alloc_xheap_pages(unsigned int order) +{ + return (void *)alloc_xenheap_pages(order); +} + +static inline void free_xheap_pages(void *p, unsigned int order) +{ + free_xenheap_pages(p,0); +} +#endif + struct xmem_pool *xmem_pool_create( const char *name, xmem_pool_get_memory get_mem, @@ -300,7 +333,7 @@ struct xmem_pool *xmem_pool_create( pool_bytes = ROUNDUP_SIZE(sizeof(*pool)); pool_order = get_order_from_bytes(pool_bytes); - pool = (void *)alloc_xenheap_pages(pool_order); + pool = (void *)alloc_xheap_pages(pool_order); if ( pool == NULL ) return NULL; memset(pool, 0, pool_bytes); @@ -334,7 +367,7 @@ struct xmem_pool *xmem_pool_create( return pool; out_region: - free_xenheap_pages(pool, pool_order); + free_xheap_pages(pool, pool_order); return NULL; } @@ -505,12 +538,12 @@ static void *xmalloc_pool_get(unsigned l static void *xmalloc_pool_get(unsigned long size) { ASSERT(size == PAGE_SIZE); - return alloc_xenheap_pages(0); + return alloc_xheap_pages(0); } static void xmalloc_pool_put(void *p) { - free_xenheap_pages(p,0); + free_xheap_pages(p,0); } static void *xmalloc_whole_pages(unsigned long size) @@ -518,7 +551,7 @@ static void *xmalloc_whole_pages(unsigne struct bhdr *b; unsigned int pageorder = get_order_from_bytes(size + BHDR_OVERHEAD); - b = alloc_xenheap_pages(pageorder); + b = alloc_xheap_pages(pageorder); if ( b == NULL ) return NULL; @@ -593,7 +626,7 @@ void xfree(void *p) } if ( b->size >= (PAGE_SIZE - (2*BHDR_OVERHEAD)) ) - free_xenheap_pages((void *)b, get_order_from_bytes(b->size)); + free_xheap_pages((void *)b, get_order_from_bytes(b->size)); else xmem_pool_free(p, xenpool); }