[GIT PULL] libnvdimm build fix for 4.6-final

[Williams, Dan J]

Hi Linus, please pull from:

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

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

---

The following changes since commit 2eea65829dc6c20dccbe79726fd0f3fe7f8aa43b:

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

are available in the git repository at:

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

for you to fetch changes up to 1b8d2afde54fade94339f573c4e05644f9ae9866:

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

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

+AKA-drivers/nvdimm/pmem.c +AHw- 4 +-+---
+AKA-1 file changed, 2 insertions(+-), 2 deletions(-)

commit 1b8d2afde54fade94339f573c4e05644f9ae9866
Author: Dan Williams +ADw-dan.j.williams+AEA-intel.com+AD4-
Date:+AKAAoACg-Fri May 6 10:20:10 2016 -0700

+AKAAoACgAKA-libnvdimm, pfn: fix ARCH+AD0-alpha allmodconfig build failure
+AKAAoACgAKA-
+AKAAoACgAKA-I had relied on the kbuild robot for cross build coverage, however it
+AKAAoACgAKA-only builds alpha+AF8-defconfig.+AKAAoA-Switch from HPAGE+AF8-SIZE to PMD+AF8-SIZE, which
+AKAAoACgAKA-is more widely defined.
+AKAAoACgAKA-
+AKAAoACgAKA-Fixes: 658922e57b84 (+ACI-libnvdimm, pfn: fix memmap reservation sizing+ACI-)
+AKAAoACgAKA-Cc: +ADw-stable+AEA-vger.kernel.org+AD4-
+AKAAoACgAKA-Reported-by: Guenter Roeck +ADw-guenter+AEA-roeck-us.net+AD4-
+AKAAoACgAKA-Tested-by: Guenter Roeck +ADw-guenter+AEA-roeck-us.net+AD4-
+AKAAoACgAKA-Signed-off-by: Dan Williams +ADw-dan.j.williams+AEA-intel.com+AD4-

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 5101f3ab4f29..92f536596b24 100644
--- a/drivers/nvdimm/pmem.c
+-+-+- b/drivers/nvdimm/pmem.c
+AEAAQA- -402,9 +-402,9 +AEAAQA- static int nd+AF8-pfn+AF8-init(struct nd+AF8-pfn +ACo-nd+AF8-pfn)
+AKA-
+AKA-		/+ACo-
+AKA-		+AKAAKg- vmemmap+AF8-populate+AF8-hugepages() allocates the memmap array in
-		+AKAAKg- HPAGE+AF8-SIZE chunks.
+-		+AKAAKg- PMD+AF8-SIZE chunks.
+AKA-		+AKAAKg-/
-		memmap+AF8-size +AD0- ALIGN(64 +ACo- npfns, HPAGE+AF8-SIZE)+ADs-
+-		memmap+AF8-size +AD0- ALIGN(64 +ACo- npfns, PMD+AF8-SIZE)+ADs-
+AKA-		offset +AD0- ALIGN(start +- SZ+AF8-8K +- memmap+AF8-size, nd+AF8-pfn-+AD4-align)
+AKA-			- start+ADs-
+AKA-	+AH0- else if (nd+AF8-pfn-+AD4-mode +AD0APQ- PFN+AF8-MODE+AF8-RAM)