mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/nvdimm/Kconfig
..
..
@@ -1,8 +1,10 @@
1
+# SPDX-License-Identifier: GPL-2.0-only
1
2
 menuconfig LIBNVDIMM
2
3
 	tristate "NVDIMM (Non-Volatile Memory Device) Support"
3
4
 	depends on PHYS_ADDR_T_64BIT
4
5
 	depends on HAS_IOMEM
5
6
 	depends on BLK_DEV
7
+	select MEMREGION
6
8
 	help
7
9
 	  Generic support for non-volatile memory devices including
8
10
 	  ACPI-6-NFIT defined resources.  On platforms that define an
..
..
@@ -32,7 +34,7 @@
32
34
 	  Documentation/admin-guide/kernel-parameters.rst).  This driver converts
33
35
 	  these persistent memory ranges into block devices that are
34
36
 	  capable of DAX (direct-access) file system mappings.  See
35
-	  Documentation/nvdimm/nvdimm.txt for more details.
37
+	  Documentation/driver-api/nvdimm/nvdimm.rst for more details.
36
38
 
37
39
 	  Say Y if you want to use an NVDIMM
38
40
 
..
..
@@ -112,4 +114,21 @@
112
114
 
113
115
 	  Select Y if unsure.
114
116
 
117
+config NVDIMM_KEYS
118
+	def_bool y
119
+	depends on ENCRYPTED_KEYS
120
+	depends on (LIBNVDIMM=ENCRYPTED_KEYS) || LIBNVDIMM=m
121
+
122
+config NVDIMM_TEST_BUILD
123
+	tristate "Build the unit test core"
124
+	depends on m
125
+	depends on COMPILE_TEST && X86_64
126
+	default m if COMPILE_TEST
127
+	help
128
+	  Build the core of the unit test infrastructure. The result of
129
+	  this build is non-functional for unit test execution, but it
130
+	  otherwise helps catch build errors induced by changes to the
131
+	  core devm_memremap_pages() implementation and other
132
+	  infrastructure.
133
+
115
134
 endif