summaryrefslogtreecommitdiff
path: root/drivers/nvdimm
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2018-04-09 09:10:22 -0700
committerDan Williams <dan.j.williams@intel.com>2018-04-09 09:10:22 -0700
commit291717b6fbdb175da88ae2144fc58d63a490128d (patch)
tree7904128b17c4b47389832fc2ae9d1a93b4f08a10 /drivers/nvdimm
parentbca811a7fd5a5c1c0644926161c2843322ab74b3 (diff)
downloadlinux-291717b6fbdb175da88ae2144fc58d63a490128d.tar.gz
libnvdimm, of_pmem: workaround OF_NUMA=n build error
Stephen reports that an x86 allmodconfig build fails to build the of_pmem driver due to a missing definition of of_node_to_nid(). That helper is currently only exported in the OF_NUMA=y case. In other cases, ppc and sparc, it is a weak symbol, and outside of those platforms it is a static inline. Until an OF_NUMA=n configuration can reliably support usage of of_node_to_nid() in modules across architectures, mark this driver as 'bool' instead of 'tristate'. Cc: Rob Herring <robh@kernel.org> Cc: Oliver O'Halloran <oohall@gmail.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r--drivers/nvdimm/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig
index 2d6862bf7436..f6c533c4d09b 100644
--- a/drivers/nvdimm/Kconfig
+++ b/drivers/nvdimm/Kconfig
@@ -103,7 +103,8 @@ config NVDIMM_DAX
Select Y if unsure
config OF_PMEM
- tristate "Device-tree support for persistent memory regions"
+ # FIXME: make tristate once OF_NUMA dependency removed
+ bool "Device-tree support for persistent memory regions"
depends on OF
default LIBNVDIMM
help