Re: [PATCH] pmem, nfit: Fix ARCH_MEMREMAP_PMEM handling on x86_32

From: Dan Williams
Date: Fri Aug 28 2015 - 23:34:15 EST


On Fri, Aug 28, 2015 at 5:16 PM, Toshi Kani <toshi.kani@xxxxxx> wrote:
> ARCH_MEMREMAP_PMEM is defined on x86_64 only per ARCH_HAS_PMEM_API.
> The following compile error in __nfit_spa_map() was observed on
> x86_32 as it refers ARCH_MEMREMAP_PMEM without #ifdef.
>
> drivers/acpi/nfit.c:1205:8: error: 'ARCH_MEMREMAP_PMEM'
> undeclared (first use in this function)
>
> Fix it by defining ARCH_MEMREMAP_PMEM to MEMREMAP_WT in <linux/pmem.h>
> when CONFIG_ARCH_HAS_PMEM_API is not set, i.e. x86_32.
>
> Remove '#ifdef ARCH_MEMREMAP_PMEM's that are no longer necessary
> with this change.
>
> Also remove the redundant definition of ARCH_MEMREMAP_PMEM in
> <asm/pmem.h>.
>
> Signed-off-by: Toshi Kani <toshi.kani@xxxxxx>
> Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
> Cc: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
> Cc: Christoph Hellwig <hch@xxxxxx>
> ----
> Apply on top of libnvdimm-for-next of the nvdimm tree.

Thanks Toshi, I'll fold this in to prevent bisection breakage.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/