From: yalin wang <yalin.wang2010@gmail.com>
Date: Thu, 27 Aug 2015 23:35:48 +0000 (-0400)
Subject: nvdimm: change to use generic kvfree()
X-Git-Tag: v4.1.12-92~18^2^2~141
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dd2a5ce317a36bb12324b5c04f091b8c5e0b49c2;p=users%2Fjedix%2Flinux-maple.git

nvdimm: change to use generic kvfree()

Orabug: 22913653

Signed-off-by: yalin wang <yalin.wang2010@gmail.com>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
(cherry picked from commit a06a7576526e10a99ea7721533e7f2df3e26baad)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c
index c05eb807d674..651b8d19d324 100644
--- a/drivers/nvdimm/dimm_devs.c
+++ b/drivers/nvdimm/dimm_devs.c
@@ -241,10 +241,7 @@ void nvdimm_drvdata_release(struct kref *kref)
 		nvdimm_free_dpa(ndd, res);
 	nvdimm_bus_unlock(dev);
 
-	if (ndd->data && is_vmalloc_addr(ndd->data))
-		vfree(ndd->data);
-	else
-		kfree(ndd->data);
+	kvfree(ndd->data);
 	kfree(ndd);
 	put_device(dev);
 }