* [PATCH] libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure
@ 2016-05-06 17:26 Dan Williams
2016-05-07 2:22 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Dan Williams @ 2016-05-06 17:26 UTC (permalink / raw)
To: linux-nvdimm; +Cc: Guenter Roeck, linux-kernel, stable
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(-)
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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure
2016-05-06 17:26 [PATCH] libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure Dan Williams
@ 2016-05-07 2:22 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2016-05-07 2:22 UTC (permalink / raw)
To: Dan Williams, linux-nvdimm; +Cc: linux-kernel, stable
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)
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-07 2:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-06 17:26 [PATCH] libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure Dan Williams
2016-05-07 2:22 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).