diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2019-03-11 12:20:30 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2019-03-11 12:20:30 -0700 |
| commit | 6fd96ff557963de8e62842a0dc360a6e3610d2bb (patch) | |
| tree | 90ea3e549269fbe6a2333986d42c2cd8c2df8d9d /drivers/nvdimm/namespace_devs.c | |
| parent | 451fed24e99d5368aab4a8977583710b692a15f0 (diff) | |
| parent | 4960461f5d22bb6d2965592c01805a97d55b132f (diff) | |
| download | lwn-6fd96ff557963de8e62842a0dc360a6e3610d2bb.tar.gz lwn-6fd96ff557963de8e62842a0dc360a6e3610d2bb.zip | |
Merge branch 'for-5.1/libnvdimm-start-pad' into libnvdimm-for-next
Merge the initial lead-in cleanups and fixes that resulted from the
effort to resolve bugs in the section-alignment padding implementation
in the nvdimm core. The back half of this topic is abandoned in favor of
implementing sub-section hotplug support.
Diffstat (limited to 'drivers/nvdimm/namespace_devs.c')
| -rw-r--r-- | drivers/nvdimm/namespace_devs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index 17fb7f931f0c..7849bf1812c4 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -138,6 +138,7 @@ bool nd_is_uuid_unique(struct device *dev, u8 *uuid) bool pmem_should_map_pages(struct device *dev) { struct nd_region *nd_region = to_nd_region(dev->parent); + struct nd_namespace_common *ndns = to_ndns(dev); struct nd_namespace_io *nsio; if (!IS_ENABLED(CONFIG_ZONE_DEVICE)) @@ -149,6 +150,9 @@ bool pmem_should_map_pages(struct device *dev) if (is_nd_pfn(dev) || is_nd_btt(dev)) return false; + if (ndns->force_raw) + return false; + nsio = to_nd_namespace_io(dev); if (region_intersects(nsio->res.start, resource_size(&nsio->res), IORESOURCE_SYSTEM_RAM, |