Commit 4757c3c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6dff52b8 d9212b35

drivers/dax/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static void dax_bus_remove(struct device *dev) 
		dax_drv->remove(dev_dax);

}



static struct bus_type dax_bus_type = {

static const struct bus_type dax_bus_type = {

	.name = "dax",

	.uevent = dax_bus_uevent,

	.match = dax_bus_match,

drivers/nvdimm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ config BLK_DEV_PMEM 
	select ND_PFN if NVDIMM_PFN

	help

	  Memory ranges for PMEM are described by either an NFIT

	  (NVDIMM Firmware Interface Table, see CONFIG_NFIT_ACPI), a

	  (NVDIMM Firmware Interface Table, see CONFIG_ACPI_NFIT), a

	  non-standard OEM-specific E820 memory type (type-12, see

	  CONFIG_X86_PMEM_LEGACY), or it is manually specified by the

	  'memmap=nn[KMG]!ss[KMG]' kernel command line (see

drivers/nvdimm/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ EXPORT_SYMBOL_GPL(nvdimm_clear_poison); 


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



static struct bus_type nvdimm_bus_type = {

static const struct bus_type nvdimm_bus_type = {

	.name = "nd",

	.uevent = nvdimm_bus_uevent,

	.match = nvdimm_bus_match,