Commit 5f0ababb authored by Isaku Yamahata's avatar Isaku Yamahata Committed by Ingo Molnar
Browse files

xen: replace callers of alloc_vm_area()/free_vm_area() with xen_ prefixed one 



Don't use alloc_vm_area()/free_vm_area() directly, instead define
xen_alloc_vm_area()/xen_free_vm_area() and use them.

alloc_vm_area()/free_vm_area() are used to allocate/free area which
are for grant table mapping. Xen/x86 grant table is based on virtual
address so that alloc_vm_area()/free_vm_area() are suitable.
On the other hand Xen/ia64 (and Xen/powerpc) grant table is based on
pseudo physical address (guest physical address) so that allocation
should be done differently.
The original version of xenified Linux/IA64 have its own
allocate_vm_area()/free_vm_area() definitions which don't allocate vm area
contradictory to those names.
Now vanilla Linux already has its definitions so that it's impossible
to have IA64 definitions of allocate_vm_area()/free_vm_area().
Instead introduce xen_allocate_vm_area()/xen_free_vm_area() and use them.

Signed-off-by: default avatarIsaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 20e71f2e

drivers/xen/grant-table.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx) 


	if (shared == NULL) {

		struct vm_struct *area;

		area = alloc_vm_area(PAGE_SIZE * max_nr_grant_frames());

		area = xen_alloc_vm_area(PAGE_SIZE * max_nr_grant_frames());

		BUG_ON(area == NULL);

		shared = area->addr;

	}

drivers/xen/xenbus/xenbus_client.c

+3 −3
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr) 


	*vaddr = NULL;



	area = alloc_vm_area(PAGE_SIZE);

	area = xen_alloc_vm_area(PAGE_SIZE);

	if (!area)

		return -ENOMEM;
@@ -409,7 +409,7 @@ int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr) 
		BUG();



	if (op.status != GNTST_okay) {

		free_vm_area(area);

		xen_free_vm_area(area);

		xenbus_dev_fatal(dev, op.status,

				 "mapping in shared page %d from domain %d",

				 gnt_ref, dev->otherend_id);
@@ -508,7 +508,7 @@ int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr) 
		BUG();



	if (op.status == GNTST_okay)

		free_vm_area(area);

		xen_free_vm_area(area);

	else

		xenbus_dev_error(dev, op.status,

				 "unmapping page at handle %d error %d",

include/asm-x86/xen/grant_table.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#ifndef __XEN_GRANT_TABLE_H

#define __XEN_GRANT_TABLE_H



#define xen_alloc_vm_area(size)	alloc_vm_area(size)

#define xen_free_vm_area(area)	free_vm_area(area)



#endif /* __XEN_GRANT_TABLE_H */

include/xen/grant_table.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#include <asm/xen/hypervisor.h>

#include <xen/interface/grant_table.h>

#include <asm/xen/grant_table.h>



/* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */

#define NR_GRANT_FRAMES 4

CRA Git | Maintained and supported by SUSTech CRA and CCSE