aboutsummaryrefslogtreecommitdiffstats
path: root/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2006-08-17 16:21:08 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2006-08-17 16:21:08 +0100
commit738c1ffa96b8d8057f0698138d5a539e963116f2 (patch)
tree1178a6e7a42fc28f35b987c586cd09fb2824ca09 /unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
parent98abf9b1f795271a8bafb74b97e856aafb185eb9 (diff)
downloadxen-738c1ffa96b8d8057f0698138d5a539e963116f2.tar.gz
xen-738c1ffa96b8d8057f0698138d5a539e963116f2.tar.bz2
xen-738c1ffa96b8d8057f0698138d5a539e963116f2.zip
[HVM] Make grant tables functions work in PV-on-HVM drivers.
Signed-off-by: Steven Smith <ssmith@xensource.com>
Diffstat (limited to 'unmodified_drivers/linux-2.6/platform-pci/platform-pci.c')
-rw-r--r--unmodified_drivers/linux-2.6/platform-pci/platform-pci.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index 941608d12f..f32399c3ce 100644
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -64,15 +64,18 @@ static int __init init_xen_info(void)
xatp.idx = 0;
xatp.space = XENMAPSPACE_shared_info;
xatp.gpfn = shared_info_frame;
- BUG_ON(HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp));
+ if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp))
+ BUG();
+
shared_info_area =
ioremap(shared_info_frame << PAGE_SHIFT, PAGE_SIZE);
-
- if (!shared_info_area)
+ if (shared_info_area == NULL)
panic("can't map shared info\n");
phys_to_machine_mapping = NULL;
+ gnttab_init();
+
return 0;
}