Re: linux-next: build failure after merge of the akpm-current tree

Stephen Rothwell
2020-05-08T03:10:32Z

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

Hi Andrew,

On Thu, 7 May 2020 19:08:08 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> This? It's based on Ira's v3 series but should work.
>
>
> From: Andrew Morton <akpm@linux-foundation.org>
> Subject: arch-kunmap-remove-duplicate-kunmap-implementations-fix
>
> fix CONFIG_HIGHMEM=n build on various architectures
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Ira Weiny <ira.weiny@intel.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> include/linux/highmem.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> --- a/include/linux/highmem.h~arch-kunmap-remove-duplicate-kunmap-implementations-fix
> +++ a/include/linux/highmem.h
> @@ -53,6 +53,7 @@ static inline void *kmap(struct page *pa
> }
>
> void kunmap_high(struct page *page);
> +
> static inline void kunmap(struct page *page)
> {
> might_sleep();
> @@ -111,6 +112,10 @@ static inline void *kmap(struct page *pa
> return page_address(page);
> }
>
> +static inline void kunmap_high(struct page *page)
> +{
> +}
> +
> static inline void kunmap(struct page *page)
> {
> }
> _
>

Thanks, I have added that to linux-next today.

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]