2015-08-29 01:20:57

by Toshi Kani

[permalink] [raw]
Subject: [PATCH] nfit: Fix undefined mmio_flush_range on x86_32

The following compile error was observed on x86_32 since nfit.c
relies on <asm/pmem.h> to include <asm/cacheflush.h>, which only
works when CONFIG_ARCH_HAS_PMEM_API is set on x86_64.

drivers/acpi/nfit.c:1085:5: error: implicit declaration of
function 'mmio_flush_range' [-Werror=implicit-function-declaration]

Change nfit.c to include <asm/cacheflush.h> directly for now.

Signed-off-by: Toshi Kani <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Ross Zwisler <[email protected]>
---
Apply on top of libnvdimm-for-next of the nvdimm tree.
This is a temporary fix and please feel free to replace it with
a better solution.
---
drivers/acpi/nfit.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c
index 82d07e8..f61e69f 100644
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@ -20,6 +20,7 @@
#include <linux/sort.h>
#include <linux/pmem.h>
#include <linux/io.h>
+#include <asm/cacheflush.h>
#include "nfit.h"

/*


2015-08-29 03:31:38

by Dan Williams

[permalink] [raw]
Subject: Re: [PATCH] nfit: Fix undefined mmio_flush_range on x86_32

On Fri, Aug 28, 2015 at 6:18 PM, Toshi Kani <[email protected]> wrote:
> The following compile error was observed on x86_32 since nfit.c
> relies on <asm/pmem.h> to include <asm/cacheflush.h>, which only
> works when CONFIG_ARCH_HAS_PMEM_API is set on x86_64.
>
> drivers/acpi/nfit.c:1085:5: error: implicit declaration of
> function 'mmio_flush_range' [-Werror=implicit-function-declaration]
>
> Change nfit.c to include <asm/cacheflush.h> directly for now.
>
> Signed-off-by: Toshi Kani <[email protected]>
> Cc: Dan Williams <[email protected]>
> Cc: Ross Zwisler <[email protected]>
> ---
> Apply on top of libnvdimm-for-next of the nvdimm tree.
> This is a temporary fix and please feel free to replace it with
> a better solution.

This looks correct to me, I'm going to fold it in to where the breakage occurs.

Thanks Toshi!