| Message ID | 146255559866.32780.5399379827409805110.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/06/2016 10:26 AM, Dan Williams wrote: > I had relied on the kbuild robot for cross build coverage, however it > only builds alpha_defconfig. Switch from HPAGE_SIZE to PMD_SIZE, which > is more widely defined. > > Fixes: 658922e57b84 ("libnvdimm, pfn: fix memmap reservation sizing") > Cc: <stable@vger.kernel.org> > Reported-by: Guenter Roeck <guenter@roeck-us.net> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Passes at least all my tests. Tested-by: Guenter Roeck <linux@roeck-us.net> Nitpick below. > --- > drivers/nvdimm/pmem.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c > index 5101f3ab4f29..e5a8bf032ec9 100644 > --- a/drivers/nvdimm/pmem.c > +++ b/drivers/nvdimm/pmem.c > @@ -404,7 +404,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) > * vmemmap_populate_hugepages() allocates the memmap array in > * HPAGE_SIZE chunks. PMD_SIZE > */ > - memmap_size = ALIGN(64 * npfns, HPAGE_SIZE); > + memmap_size = ALIGN(64 * npfns, PMD_SIZE); > offset = ALIGN(start + SZ_8K + memmap_size, nd_pfn->align) > - start; > } else if (nd_pfn->mode == PFN_MODE_RAM) > >
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 5101f3ab4f29..e5a8bf032ec9 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -404,7 +404,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) * vmemmap_populate_hugepages() allocates the memmap array in * HPAGE_SIZE chunks. */ - memmap_size = ALIGN(64 * npfns, HPAGE_SIZE); + memmap_size = ALIGN(64 * npfns, PMD_SIZE); offset = ALIGN(start + SZ_8K + memmap_size, nd_pfn->align) - start; } else if (nd_pfn->mode == PFN_MODE_RAM)
I had relied on the kbuild robot for cross build coverage, however it only builds alpha_defconfig. Switch from HPAGE_SIZE to PMD_SIZE, which is more widely defined. Fixes: 658922e57b84 ("libnvdimm, pfn: fix memmap reservation sizing") Cc: <stable@vger.kernel.org> Reported-by: Guenter Roeck <guenter@roeck-us.net> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/nvdimm/pmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)