Skip to content

Commit c146855

Browse files
committed
tools/testing/nvdimm: Fix mock support for ioremap
After commit d092a87 "arch: rely on asm-generic/io.h for default ioremap_* definitions" the ioremap_nocache() symbol has been replaced with ioremap(). Update the mocked symbol list for nvdimm testing. Link: https://lore.kernel.org/r/157369090817.2974548.10148423996292973088.stgit@dwillia2-desk3.amr.corp.intel.com Fixes: d092a87 ("arch: rely on asm-generic/io.h for default ioremap_* definitions") Signed-off-by: Dan Williams <[email protected]>
1 parent e42617b commit c146855

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

tools/testing/nvdimm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ldflags-y += --wrap=devm_ioremap_nocache
55
ldflags-y += --wrap=devm_memremap
66
ldflags-y += --wrap=devm_memunmap
77
ldflags-y += --wrap=ioremap_nocache
8+
ldflags-y += --wrap=ioremap
89
ldflags-y += --wrap=iounmap
910
ldflags-y += --wrap=memunmap
1011
ldflags-y += --wrap=__devm_request_region

tools/testing/nvdimm/test/iomap.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,12 @@ void __iomem *__wrap_ioremap_nocache(resource_size_t offset, unsigned long size)
193193
}
194194
EXPORT_SYMBOL(__wrap_ioremap_nocache);
195195

196+
void __iomem *__wrap_ioremap(resource_size_t offset, unsigned long size)
197+
{
198+
return __nfit_test_ioremap(offset, size, ioremap);
199+
}
200+
EXPORT_SYMBOL(__wrap_ioremap);
201+
196202
void __iomem *__wrap_ioremap_wc(resource_size_t offset, unsigned long size)
197203
{
198204
return __nfit_test_ioremap(offset, size, ioremap_wc);

0 commit comments

Comments
 (0)