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

Andrew Morton
2015-10-21T06:46:01Z

On Wed, 21 Oct 2015 17:34:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
>
> After merging the akpm-current tree, today's linux-next build (arm
> allnoconfig and others) failed like this:
>
> In file included from init/main.c:50:0:
> include/linux/rmap.h:274:1: error: expected declaration specifiers or '...' before '{' token
>
> Caused by commit
>
> e4f28388eb72 ("mm: simplify reclaim path for MADV_FREE")
>
> Discovered after the linux-next release.

argh, we broke nommu.

--- a/include/linux/rmap.h~mm-dont-split-thp-page-when-syscall-is-called-fix-6-fix
+++ a/include/linux/rmap.h
@@ -270,7 +270,7 @@ int rmap_walk(struct page *page, struct

static inline int page_referenced(struct page *page, int is_locked,
struct mem_cgroup *memcg,
- unsigned long *vm_flags,
+ unsigned long *vm_flags)
{
*vm_flags = 0;
return 0;