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

Martin Schwidefsky
2011-05-20T09:24:58Z

On Fri, 20 May 2011 11:56:51 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> After merging the s390 tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> mm/rmap.c:788:54: error: macro "page_test_and_clear_dirty" passed 2 arguments, but takes just 1
> mm/rmap.c: In function 'page_mkclean':
> mm/rmap.c:788: error: 'page_test_and_clear_dirty' undeclared (first use in this function)
> mm/rmap.c:788: error: (Each undeclared identifier is reported only once
> mm/rmap.c:788: error: for each function it appears in.)
> mm/rmap.c:983:52: error: macro "page_test_and_clear_dirty" passed 2 arguments, but takes just 1
> mm/rmap.c: In function 'page_remove_rmap':
> mm/rmap.c:983: error: 'page_test_and_clear_dirty' undeclared (first use in this function)
>
> Caused by commit 4cbfc8b9f58c ("[S390] merge page_test_dirty and page_clear_dirty").
>
> I have used the s390 tree from next-20110519 for today.

Oops, sorry about that. Fixed the patch and updated git390.

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.