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

Stephen Rothwell
2015-01-19T07:35:43Z

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

Hi Andrew,

On Mon, 19 Jan 2015 18:28:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the akpm-current tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> mm/filemap_xip.c:304:2: error: unknown field 'remap_pages' specified in initializer
> .remap_pages = generic_file_remap_pages,
> ^
> mm/filemap_xip.c:304:17: error: 'generic_file_remap_pages' undeclared here (not in a function)
> .remap_pages = generic_file_remap_pages,
> ^
>
> Caused by commit 76f0255272b6 ("mm: drop vm_ops->remap_pages and
> generic_file_remap_pages() stub"). Looks like one was missed - grep is
> your friend.
>
> I have added this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 19 Jan 2015 18:16:15 +1100
> Subject: [PATCH] mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub fix
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> mm/filemap_xip.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
> index 0d105aeff82f..70c09da1a419 100644
> --- a/mm/filemap_xip.c
> +++ b/mm/filemap_xip.c
> @@ -301,7 +301,6 @@ out:
> static const struct vm_operations_struct xip_file_vm_ops = {
> .fault = xip_file_fault,
> .page_mkwrite = filemap_page_mkwrite,
> - .remap_pages = generic_file_remap_pages,
> };
>
> int xip_file_mmap(struct file * file, struct vm_area_struct * vma)
> --
> 2.1.4

I then had to fix up the later patch "dax,ext2: replace the XIP page
fault handler with the DAX page fault handler" because the above line
was already removed.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

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