Commit 2d0bd953 authored May 09, 2016 by Linus Torvalds

nvdimm

Pull libnvdimm build fix from Dan Williams:
 "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"

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure

parents 0161028b 1b8d2afd

drivers/nvdimm/pmem.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)