|
@@ -222,8 +222,11 @@ int ipz_queue_ctor(struct ehca_pd *pd, struct ipz_queue *queue,
|
|
/* allocate queue page pointers */
|
|
/* allocate queue page pointers */
|
|
queue->queue_pages = kmalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);
|
|
queue->queue_pages = kmalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);
|
|
if (!queue->queue_pages) {
|
|
if (!queue->queue_pages) {
|
|
- ehca_gen_err("Couldn't allocate queue page list");
|
|
|
|
- return 0;
|
|
|
|
|
|
+ queue->queue_pages = vmalloc(nr_of_pages * sizeof(void *));
|
|
|
|
+ if (!queue->queue_pages) {
|
|
|
|
+ ehca_gen_err("Couldn't allocate queue page list");
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
memset(queue->queue_pages, 0, nr_of_pages * sizeof(void *));
|
|
memset(queue->queue_pages, 0, nr_of_pages * sizeof(void *));
|
|
|
|
|
|
@@ -240,7 +243,10 @@ int ipz_queue_ctor(struct ehca_pd *pd, struct ipz_queue *queue,
|
|
ipz_queue_ctor_exit0:
|
|
ipz_queue_ctor_exit0:
|
|
ehca_gen_err("Couldn't alloc pages queue=%p "
|
|
ehca_gen_err("Couldn't alloc pages queue=%p "
|
|
"nr_of_pages=%x", queue, nr_of_pages);
|
|
"nr_of_pages=%x", queue, nr_of_pages);
|
|
- kfree(queue->queue_pages);
|
|
|
|
|
|
+ if (is_vmalloc_addr(queue->queue_pages))
|
|
|
|
+ vfree(queue->queue_pages);
|
|
|
|
+ else
|
|
|
|
+ kfree(queue->queue_pages);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -262,7 +268,10 @@ int ipz_queue_dtor(struct ehca_pd *pd, struct ipz_queue *queue)
|
|
free_page((unsigned long)queue->queue_pages[i]);
|
|
free_page((unsigned long)queue->queue_pages[i]);
|
|
}
|
|
}
|
|
|
|
|
|
- kfree(queue->queue_pages);
|
|
|
|
|
|
+ if (is_vmalloc_addr(queue->queue_pages))
|
|
|
|
+ vfree(queue->queue_pages);
|
|
|
|
+ else
|
|
|
|
+ kfree(queue->queue_pages);
|
|
|
|
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|