Skip to content

Commit

Permalink
libnvdimm, of_pmem: workaround OF_NUMA=n build error
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Oliver O'Halloran <[email protected]>
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Dan Williams <[email protected]>
  • Loading branch information
djbw committed Apr 9, 2018
1 parent bca811a commit 291717b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/nvdimm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 291717b

Please sign in to comment.