diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c77ef59d7bf2c2b41317b525e1415fb52d87e858..1d3176a41a29694e2595743c9ce50bcf98c9e3bc 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1667,14 +1667,12 @@ config ILLEGAL_POINTER_VALUE
 	default 0 if X86_32
 	default 0xdead000000000000 if X86_64
 
-config X86_PMEM_LEGACY_DEVICE
-	bool
-
 config X86_PMEM_LEGACY
 	tristate "Support non-standard NVDIMMs and ADR protected memory"
 	depends on PHYS_ADDR_T_64BIT
 	depends on BLK_DEV
-	select X86_PMEM_LEGACY_DEVICE
+	select PMEM_LEGACY
+	select PMEM_LEGACY_DEVICE
 	select NUMA_KEEP_MEMINFO if NUMA
 	select LIBNVDIMM
 	help
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index f0606f816aa89b9cae0741575f6de99c172d024f..1e127514c824f9b7ebf1abe9dd53115ed1ec1ab7 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -130,7 +130,6 @@ obj-$(CONFIG_KVM_GUEST)		+= kvm.o kvmclock.o
 obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o
 obj-$(CONFIG_PARAVIRT_CLOCK)	+= pvclock.o
-obj-$(CONFIG_X86_PMEM_LEGACY_DEVICE) += pmem.o
 
 obj-$(CONFIG_JAILHOUSE_GUEST)	+= jailhouse.o
 
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig
index b7d1eb38b27d464f15b610908ae1a7d8ac39b6a3..632b6eda525239f38f719c70a5317359af1b133e 100644
--- a/drivers/nvdimm/Kconfig
+++ b/drivers/nvdimm/Kconfig
@@ -19,6 +19,12 @@ menuconfig LIBNVDIMM
 
 if LIBNVDIMM
 
+config PMEM_LEGACY
+	tristate
+
+config PMEM_LEGACY_DEVICE
+	bool
+
 config BLK_DEV_PMEM
 	tristate "PMEM: Persistent memory block device support"
 	default LIBNVDIMM
diff --git a/drivers/nvdimm/Makefile b/drivers/nvdimm/Makefile
index 04077532f7ed5e9a2fbbebf3c8f4c7d6ddea6ad6..2098221f1c907b1faf05927f406482c318256620 100644
--- a/drivers/nvdimm/Makefile
+++ b/drivers/nvdimm/Makefile
@@ -3,6 +3,8 @@ obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
 obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
 obj-$(CONFIG_ND_BTT) += nd_btt.o
 obj-$(CONFIG_ND_BLK) += nd_blk.o
+obj-$(CONFIG_PMEM_LEGACY_DEVICE) += pmem_legacy_device.o
+obj-$(CONFIG_PMEM_LEGACY) += nd_e820.o
 obj-$(CONFIG_OF_PMEM) += of_pmem.o
 obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o
 
diff --git a/arch/x86/kernel/pmem.c b/drivers/nvdimm/pmem_legacy_device.c
similarity index 100%
rename from arch/x86/kernel/pmem.c
rename to drivers/nvdimm/pmem_legacy_device.c
diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild
index 47f9cc9dcd94b560e7f520d0f56f1284840c535c..77aa117fbd114efa8f3814a38d03005bbc11ddaf 100644
--- a/tools/testing/nvdimm/Kbuild
+++ b/tools/testing/nvdimm/Kbuild
@@ -28,7 +28,7 @@ obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
 obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
 obj-$(CONFIG_ND_BTT) += nd_btt.o
 obj-$(CONFIG_ND_BLK) += nd_blk.o
-obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o
+obj-$(CONFIG_PMEM_LEGACY) += nd_e820.o
 obj-$(CONFIG_ACPI_NFIT) += nfit.o
 ifeq ($(CONFIG_DAX),m)
 obj-$(CONFIG_DAX) += dax.o