Skip to content

Commit 4757c3c

Browse files
committed
Merge tag 'libnvdimm-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm updates from Dave Jiang: - ACPI_NFIT Kconfig documetation fix - Make nvdimm_bus_type const - Make dax_bus_type const - remove SLAB_MEM_SPREAD flag usage in DAX * tag 'libnvdimm-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax: remove SLAB_MEM_SPREAD flag usage device-dax: make dax_bus_type const nvdimm: make nvdimm_bus_type const libnvdimm: Fix ACPI_NFIT in BLK_DEV_PMEM help
2 parents 6dff52b + d9212b3 commit 4757c3c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

drivers/dax/bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static void dax_bus_remove(struct device *dev)
241241
dax_drv->remove(dev_dax);
242242
}
243243

244-
static struct bus_type dax_bus_type = {
244+
static const struct bus_type dax_bus_type = {
245245
.name = "dax",
246246
.uevent = dax_bus_uevent,
247247
.match = dax_bus_match,

drivers/nvdimm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ config BLK_DEV_PMEM
2424
select ND_PFN if NVDIMM_PFN
2525
help
2626
Memory ranges for PMEM are described by either an NFIT
27-
(NVDIMM Firmware Interface Table, see CONFIG_NFIT_ACPI), a
27+
(NVDIMM Firmware Interface Table, see CONFIG_ACPI_NFIT), a
2828
non-standard OEM-specific E820 memory type (type-12, see
2929
CONFIG_X86_PMEM_LEGACY), or it is manually specified by the
3030
'memmap=nn[KMG]!ss[KMG]' kernel command line (see

drivers/nvdimm/bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ EXPORT_SYMBOL_GPL(nvdimm_clear_poison);
271271

272272
static int nvdimm_bus_match(struct device *dev, struct device_driver *drv);
273273

274-
static struct bus_type nvdimm_bus_type = {
274+
static const struct bus_type nvdimm_bus_type = {
275275
.name = "nd",
276276
.uevent = nvdimm_bus_uevent,
277277
.match = nvdimm_bus_match,

0 commit comments

Comments
 (0)