tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
libnvdimm, pmem: move pmem to drivers/nvdimm/
Prepare the pmem driver to consume PMEM namespaces emitted by regions of
an nvdimm_bus instance. No functional change.
Acked-by: Christoph Hellwig <hch@lst.de>
Tested-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+25
-13
-11
drivers/block/Kconfig
-11
drivers/block/Kconfig
···
404
404
and will prevent RAM block device backing store memory from being
405
405
allocated from highmem (only a problem for highmem systems).
406
406
407
-
config BLK_DEV_PMEM
408
-
tristate "Persistent memory block device support"
409
-
help
410
-
Saying Y here will allow you to use a contiguous range of reserved
411
-
memory as one or more persistent block devices.
412
-
413
-
To compile this driver as a module, choose M here: the module will be
414
-
called 'pmem'.
415
-
416
-
If unsure, say N.
417
-
418
407
config CDROM_PKTCDVD
419
408
tristate "Packet writing on CD/DVD media"
420
409
depends on !UML
-1
drivers/block/Makefile
-1
drivers/block/Makefile
···
14
14
obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o
15
15
obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o
16
16
obj-$(CONFIG_BLK_DEV_RAM) += brd.o
17
-
obj-$(CONFIG_BLK_DEV_PMEM) += pmem.o
18
17
obj-$(CONFIG_BLK_DEV_LOOP) += loop.o
19
18
obj-$(CONFIG_BLK_CPQ_DA) += cpqarray.o
20
19
obj-$(CONFIG_BLK_CPQ_CISS_DA) += cciss.o
drivers/block/pmem.c
drivers/nvdimm/pmem.c
drivers/block/pmem.c
drivers/nvdimm/pmem.c
+22
-1
drivers/nvdimm/Kconfig
+22
-1
drivers/nvdimm/Kconfig
···
1
-
config LIBNVDIMM
1
+
menuconfig LIBNVDIMM
2
2
tristate "NVDIMM (Non-Volatile Memory Device) Support"
3
3
depends on PHYS_ADDR_T_64BIT
4
4
depends on BLK_DEV
···
13
13
CONFIG_DAX). A BLK namespace refers to an NVDIMM control
14
14
region which exposes an mmio register set for windowed
15
15
access mode to non-volatile memory.
16
+
17
+
if LIBNVDIMM
18
+
19
+
config BLK_DEV_PMEM
20
+
tristate "PMEM: Persistent memory block device support"
21
+
default LIBNVDIMM
22
+
depends on HAS_IOMEM
23
+
help
24
+
Memory ranges for PMEM are described by either an NFIT
25
+
(NVDIMM Firmware Interface Table, see CONFIG_NFIT_ACPI), a
26
+
non-standard OEM-specific E820 memory type (type-12, see
27
+
CONFIG_X86_PMEM_LEGACY), or it is manually specified by the
28
+
'memmap=nn[KMG]!ss[KMG]' kernel command line (see
29
+
Documentation/kernel-parameters.txt). This driver converts
30
+
these persistent memory ranges into block devices that are
31
+
capable of DAX (direct-access) file system mappings. See
32
+
Documentation/nvdimm/nvdimm.txt for more details.
33
+
34
+
Say Y if you want to use an NVDIMM
35
+
36
+
endif