aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/xen
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@citrix.com>2011-09-29 11:53:29 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-09-29 15:02:18 -0400
commit4dcaebbf6586d299be8513512a1253f177b803d7 (patch)
tree0f10ceff7ba544fe83a9644800695054047172a8 /arch/ia64/xen
parenta102a9ece5489e1718cd7543aa079082450ac3a2 (diff)
xen: use generic functions instead of xen_{alloc, free}_vm_area()
Replace calls to the Xen-specific xen_alloc_vm_area() and xen_free_vm_area() functions with the generic equivalent (alloc_vm_area() and free_vm_area()). On x86, these were identical already. Signed-off-by: David Vrabel <david.vrabel@citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/ia64/xen')
-rw-r--r--arch/ia64/xen/grant-table.c62
1 files changed, 0 insertions, 62 deletions
diff --git a/arch/ia64/xen/grant-table.c b/arch/ia64/xen/grant-table.c
index 48cca37625eb..c18281332f84 100644
--- a/arch/ia64/xen/grant-table.c
+++ b/arch/ia64/xen/grant-table.c
@@ -31,68 +31,6 @@
31 31
32#include <asm/xen/hypervisor.h> 32#include <asm/xen/hypervisor.h>
33 33
34struct vm_struct *xen_alloc_vm_area(unsigned long size)
35{
36 int order;
37 unsigned long virt;
38 unsigned long nr_pages;
39 struct vm_struct *area;
40
41 order = get_order(size);
42 virt = __get_free_pages(GFP_KERNEL, order);
43 if (virt == 0)
44 goto err0;
45 nr_pages = 1 << order;
46 scrub_pages(virt, nr_pages);
47
48 area = kmalloc(sizeof(*area), GFP_KERNEL);
49 if (area == NULL)
50 goto err1;
51
52 area->flags = VM_IOREMAP;
53 area->addr = (void *)virt;
54 area->size = size;
55 area->pages = NULL;
56 area->nr_pages = nr_pages;
57 area->phys_addr = 0; /* xenbus_map_ring_valloc uses this field! */
58
59 return area;
60
61err1:
62 free_pages(virt, order);
63err0:
64 return NULL;
65}
66EXPORT_SYMBOL_GPL(xen_alloc_vm_area);
67
68void xen_free_vm_area(struct vm_struct *area)
69{
70 unsigned int order = get_order(area->size);
71 unsigned long i;
72 unsigned long phys_addr = __pa(area->addr);
73
74 /* This area is used for foreign page mappping.
75 * So underlying machine page may not be assigned. */
76 for (i = 0; i < (1 << order); i++) {
77 unsigned long ret;
78 unsigned long gpfn = (phys_addr >> PAGE_SHIFT) + i;
79 struct xen_memory_reservation reservation = {
80 .nr_extents = 1,
81 .address_bits = 0,
82 .extent_order = 0,
83 .domid = DOMID_SELF
84 };
85 set_xen_guest_handle(reservation.extent_start, &gpfn);
86 ret = HYPERVISOR_memory_op(XENMEM_populate_physmap,
87 &reservation);
88 BUG_ON(ret != 1);
89 }
90 free_pages((unsigned long)area->addr, order);
91 kfree(area);
92}
93EXPORT_SYMBOL_GPL(xen_free_vm_area);
94
95
96/**************************************************************************** 34/****************************************************************************
97 * grant table hack 35 * grant table hack
98 * cmd: GNTTABOP_xxx 36 * cmd: GNTTABOP_xxx