summaryrefslogtreecommitdiffstats
path: root/tools/testing/nvdimm/Kbuild
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-08-28 01:40:26 +0200
committerDan Williams <dan.j.williams@intel.com>2015-08-28 01:40:26 +0200
commit4a9bf88a5caa8495b5eb2b738d5fb40924bbc538 (patch)
tree7c2901cb67a7dd7c863fee6924afe24be79cddab /tools/testing/nvdimm/Kbuild
parentnvdimm: change to use generic kvfree() (diff)
parentnd_blk: change aperture mapping from WC to WB (diff)
downloadlinux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.tar.xz
linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.zip
Merge branch 'pmem-api' into libnvdimm-for-next
Diffstat (limited to 'tools/testing/nvdimm/Kbuild')
-rw-r--r--tools/testing/nvdimm/Kbuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild
index d7c136a96346..98f2881ba6a2 100644
--- a/tools/testing/nvdimm/Kbuild
+++ b/tools/testing/nvdimm/Kbuild
@@ -1,9 +1,11 @@
-ldflags-y += --wrap=ioremap_wt
ldflags-y += --wrap=ioremap_wc
+ldflags-y += --wrap=memremap
ldflags-y += --wrap=devm_ioremap_nocache
-ldflags-y += --wrap=ioremap_cache
+ldflags-y += --wrap=devm_memremap
ldflags-y += --wrap=ioremap_nocache
ldflags-y += --wrap=iounmap
+ldflags-y += --wrap=memunmap
+ldflags-y += --wrap=__devm_request_region
ldflags-y += --wrap=__request_region
ldflags-y += --wrap=__release_region