diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-15 11:58:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-15 11:58:32 -0700 |
| commit | 4757c3c64a71820a37da7a14c5b63a1f26fed0f5 (patch) | |
| tree | 3af1aba2ca0a15f1bb9721b843af7d8eec8bd2b6 /drivers/dax | |
| parent | 6dff52b828655ccf416f46c08a48679740b724f0 (diff) | |
| parent | d9212b35da52109361247b66010802d43c6b1f0d (diff) | |
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
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 27c86d0ca711..797e1ebff299 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -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, |