Merge branch 'fix/hda' into for-linus

[pandora-kernel.git] / drivers / infiniband / hw / ehca / ehca_pd.c

diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c
index 3dafd7f..351577a 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_pd.c
+++ b/drivers/infiniband/hw/ehca/ehca_pd.c
@@ -38,7 +38,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <asm/current.h>
+#include <linux/slab.h>
 
 #include "ehca_tools.h"
 #include "ehca_iverbs.h"
@@ -58,7 +58,6 @@ struct ib_pd *ehca_alloc_pd(struct ib_device *device,
                return ERR_PTR(-ENOMEM);
        }
 
-       pd->ownpid = current->tgid;
        for (i = 0; i < 2; i++) {
                INIT_LIST_HEAD(&pd->free[i]);
                INIT_LIST_HEAD(&pd->full[i]);
@@ -85,19 +84,10 @@ struct ib_pd *ehca_alloc_pd(struct ib_device *device,
 
 int ehca_dealloc_pd(struct ib_pd *pd)
 {
-       u32 cur_pid = current->tgid;
        struct ehca_pd *my_pd = container_of(pd, struct ehca_pd, ib_pd);
        int i, leftovers = 0;
-       extern struct kmem_cache *small_qp_cache;
        struct ipz_small_queue_page *page, *tmp;
 
-       if (my_pd->ib_pd.uobject && my_pd->ib_pd.uobject->context &&
-           my_pd->ownpid != cur_pid) {
-               ehca_err(pd->device, "Invalid caller pid=%x ownpid=%x",
-                        cur_pid, my_pd->ownpid);
-               return -EINVAL;
-       }
-
        for (i = 0; i < 2; i++) {
                list_splice(&my_pd->full[i], &my_pd->free[i]);
                list_for_each_entry_safe(page, tmp, &my_pd->free[i], list) {