nvdimm/region: Fix default alignment for small regions

[linux-2.6-microblaze.git] / drivers / nvdimm / region_devs.c

diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index 9ccf3d6..70ad891 100644 (file)
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -1025,6 +1025,9 @@ static unsigned long default_align(struct nd_region *nd_region)
                }
        }
 
+       if (nd_region->ndr_size < MEMREMAP_COMPAT_ALIGN_MAX)
+               align = PAGE_SIZE;
+
        mappings = max_t(u16, 1, nd_region->ndr_mappings);
        div_u64_rem(align, mappings, &remainder);
        if (remainder)