Re: linux-next: build failure after merge of the final tree(tip/s390 trees related)

From: Ralf Baechle
Date: Thu Oct 18 2012 - 11:02:06 EST


On Thu, Oct 18, 2012 at 05:22:01PM +1100, Stephen Rothwell wrote:

> Caused by commit 35d3d3427314 ("s390/thp: select
> HAVE_ARCH_TRANSPARENT_HUGEPAGE") from the s390 tree interacting with
> commit 93c9d633bd9e ("mm/thp: Preserve pgprot across huge page split")
> from the tip tree.
>
> N.B. Mips also selects HAVE_ARCH_TRANSPARENT_HUGEPAGE as of commit
> e21a828a1bba ("MIPS: Transparent Huge Pages support") from the mips tree
> and so will be broken in some configs now as well.

The other issue I'm running into is:

CC mm/huge_memory.o
mm/huge_memory.c: In function âdo_huge_pmd_prot_noneâ:
mm/huge_memory.c:789:3: error: incompatible type for argument 3 of âupdate_mmu_cacheâ
In file included from include/linux/mm.h:44:0,
from mm/huge_memory.c:8:
/home/ralf/src/linux/linux-mips/arch/mips/include/asm/pgtable.h:375:91: note: expected âstruct pte_t *â but argument is of type âpmd_tâ
mm/huge_memory.c: In function â__split_huge_page_mapâ:
mm/huge_memory.c:1424:2: error: implicit declaration of function âpmd_pgprotâ [-Werror=implicit-function-declaration]
mm/huge_memory.c:1424:7: error: incompatible types when assigning to type âpgprot_tâ from type âintâ
cc1: some warnings being treated as errors
make[1]: *** [mm/huge_memory.o] Error 1

which is caused by:

commit a573b4dfcf58f86235d586ea1f82ed54b2b7e620
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Tue Jul 17 18:25:14 2012 +0200

mm/mpol: Create special PROT_NONE infrastructure

is adding a update_mmu_cache() call with incorrect arguments to
do_huge_pmd_prot_none(). This only shows up where update_mmu_cache()
is implemented as a C function; the usual macro implementation is eating
everything and the kitchensink as arguments.

Ralf
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/