From: Dan Williams Date: Fri, 6 May 2016 17:20:10 +0000 (-0700) Subject: libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure X-Git-Tag: v4.14-rc1~3169^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b8d2afde54fade94339f573c4e05644f9ae9866;p=platform%2Fkernel%2Flinux-rpi.git libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure 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: Reported-by: Guenter Roeck Tested-by: Guenter Roeck Signed-off-by: Dan Williams --- diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 5101f3a..92f5365 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -402,9 +402,9 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) /* * vmemmap_populate_hugepages() allocates the memmap array in - * HPAGE_SIZE chunks. + * PMD_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)