[PATCH] libnvdimm, of_pmem: workaround OF_NUMA=n build error

[Dan Williams]

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 
Cc: Oliver O'Halloran 
Reported-by: Stephen Rothwell 
Signed-off-by: Dan Williams 
---
 drivers/nvdimm/Kconfig |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

[PATCH] libnvdimm, of_pmem: workaround OF_NUMA=n build error

[Dan Williams]

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 
Cc: Oliver O'Halloran 
Reported-by: Stephen Rothwell 
Signed-off-by: Dan Williams 
---
 drivers/nvdimm/Kconfig |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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