diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-16 11:36:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-16 11:36:40 -0700 |
| commit | e4a55b555db6d2a006551605ef4404529e878cd2 (patch) | |
| tree | 0d9c63a4f687aac41fba3a0f7eeedcdc952a9abb /drivers | |
| parent | 60cb1da6ed4a62ec8331e25ad4be87115cd28feb (diff) | |
| parent | d5240fa65db071909e9d1d5adcc5fd1abc8e96fe (diff) | |
Merge tag 'libnvdimm-fixes-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fix from Ira Weiny:
"Commit f467fee48da4 ("block: move the dax flag to queue_limits") broke
the DAX tests by skipping over the legacy pmem mapping pages case.
Set the DAX flag in this case as well"
* tag 'libnvdimm-fixes-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvdimm/pmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 1ae8b2351654..210fb77f51ba 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -498,7 +498,7 @@ static int pmem_attach_disk(struct device *dev, } if (fua) lim.features |= BLK_FEAT_FUA; - if (is_nd_pfn(dev)) + if (is_nd_pfn(dev) || pmem_should_map_pages(dev)) lim.features |= BLK_FEAT_DAX; if (!devm_request_mem_region(dev, res->start, resource_size(res), |