Skip to contentSkip to conversation

libnvdimm build fix for 4.6-final

GIT PULL Williams, Dan J 1 participant 1 message May 10, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Linus, please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm libnvdimm-fixes

...to receive a build fix for the usage of HPAGE_SIZE in the last libnvdimm pull request.  I have taken note that the kbuild robot build success test does not include results for alpha_allmodconfig.  Thanks to Guenter for the report.  It's tagged for -stable since the original fix will land there and cause build problems.

---

The following changes since commit 2eea65829dc6c20dccbe79726fd0f3fe7f8aa43b:

  nfit: fix translation of command status results (2016-05-02 09:11:53 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm libnvdimm-fixes

for you to fetch changes up to 1b8d2afde54fade94339f573c4e05644f9ae9866:

  libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure (2016-05-06 10:20:10 -0700)

----------------------------------------------------------------
Dan Williams (1):
      libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure

 drivers/nvdimm/pmem.c | 4 +-+---

 1 file changed, 2 insertions(+-), 2 deletions(-)

commit 1b8d2afde54fade94339f573c4e05644f9ae9866
Author: Dan Williams <[email protected]>
Date:   Fri May 6 10:20:10 2016 -0700

    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")
drivers/nvdimm/pmem.c +0 -0
index 5101f3ab4f29..92f536596b24 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)