From f49344da7a1274c5025ad77b1ad6e20498ca384a Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Fri, 29 Dec 2006 16:47:37 -0800 Subject: [PATCH] --- yaml --- r: 45107 b: refs/heads/master c: 9d79f1b4677cfe503f721000529f1462ca7b6f6d h: refs/heads/master i: 45105: 0ff36ba53dbd6322da5b283011e36d807b4462e8 45103: 37143e977cf0ee407488519078a093eaaad44106 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_provider.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7a87d2db6ac9..470bb99e059b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31f87cf48d54f5930e6e8e827989c18b0069c94a +refs/heads/master: 9d79f1b4677cfe503f721000529f1462ca7b6f6d diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_provider.c b/trunk/drivers/infiniband/hw/mthca/mthca_provider.c index 7ec7c4b937f9..7b96751695ea 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_provider.c @@ -1100,10 +1100,11 @@ static struct ib_fmr *mthca_alloc_fmr(struct ib_pd *pd, int mr_access_flags, struct mthca_fmr *fmr; int err; - fmr = kmemdup(fmr_attr, sizeof *fmr, GFP_KERNEL); + fmr = kmalloc(sizeof *fmr, GFP_KERNEL); if (!fmr) return ERR_PTR(-ENOMEM); + memcpy(&fmr->attr, fmr_attr, sizeof *fmr_attr); err = mthca_fmr_alloc(to_mdev(pd->device), to_mpd(pd)->pd_num, convert_access(mr_access_flags), fmr);