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

[Stephen Rothwell]

Hi all,

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.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature