IB/ehca: Tolerate dynamic memory operations before driver load

[safe/jmp/linux-2.6] / drivers / infiniband / hw / ehca / hcp_phyp.c

diff --git a/drivers/infiniband/hw/ehca/hcp_phyp.c b/drivers/infiniband/hw/ehca/hcp_phyp.c
index 2148210..b3e0e72 100644 (file)
--- a/drivers/infiniband/hw/ehca/hcp_phyp.c
+++ b/drivers/infiniband/hw/ehca/hcp_phyp.c
@@ -54,12 +54,15 @@ int hcall_unmap_page(u64 mapaddr)
        return 0;
 }
 
-int hcp_galpas_ctor(struct h_galpas *galpas,
+int hcp_galpas_ctor(struct h_galpas *galpas, int is_user,
                    u64 paddr_kernel, u64 paddr_user)
 {
-       int ret = hcall_map_page(paddr_kernel, &galpas->kernel.fw_handle);
-       if (ret)
-               return ret;
+       if (!is_user) {
+               int ret = hcall_map_page(paddr_kernel, &galpas->kernel.fw_handle);
+               if (ret)
+                       return ret;
+       } else
+               galpas->kernel.fw_handle = 0;
 
        galpas->user.fw_handle = paddr_user;