diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-07-10 11:06:11 -0600 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-07-10 13:50:50 -0400 |
| commit | b1b2e6235a44174151fa3bb22657f74972635618 (patch) | |
| tree | d4bc993420914f1be77a0b017d9dcac51f93ca58 /tools | |
| parent | b864bc17f1c326783f2388057e15d3e153125ab9 (diff) | |
| download | linux-stable-b1b2e6235a44174151fa3bb22657f74972635618.tar.gz linux-stable-b1b2e6235a44174151fa3bb22657f74972635618.tar.bz2 linux-stable-b1b2e6235a44174151fa3bb22657f74972635618.zip | |
tools/testing/nvdimm: mock ioremap_wt
In the 4.2-rc1 merge the default_memremap_pmem() implementation switched
from ioremap_nocache() to ioremap_wt(). Add it to the list of mocked
routines to restore the ability to run the unit tests.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/nvdimm/Kbuild | 1 | ||||
| -rw-r--r-- | tools/testing/nvdimm/test/iomap.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild index 8e9b64520ec1..8e020601c773 100644 --- a/tools/testing/nvdimm/Kbuild +++ b/tools/testing/nvdimm/Kbuild @@ -1,3 +1,4 @@ +ldflags-y += --wrap=ioremap_wt ldflags-y += --wrap=ioremap_cache ldflags-y += --wrap=ioremap_nocache ldflags-y += --wrap=iounmap diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c index c85a6f6ba559..9f21b150396b 100644 --- a/tools/testing/nvdimm/test/iomap.c +++ b/tools/testing/nvdimm/test/iomap.c @@ -77,6 +77,12 @@ void __iomem *__wrap_ioremap_nocache(resource_size_t offset, unsigned long size) } EXPORT_SYMBOL(__wrap_ioremap_nocache); +void __iomem *__wrap_ioremap_wt(resource_size_t offset, unsigned long size) +{ + return __nfit_test_ioremap(offset, size, ioremap_wt); +} +EXPORT_SYMBOL(__wrap_ioremap_wt); + void __wrap_iounmap(volatile void __iomem *addr) { struct nfit_test_resource *nfit_res; |