linux-next: powerpc tree build failure

linux-next: powerpc tree build failure

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

In file included from include2/asm/pgtable.h:13,
                 from include/linux/mm.h:39,
                 from include/linux/mman.h:14,
                 from arch/powerpc/kernel/asm-offsets.c:22:
include2/asm/pgtable-ppc64.h:325: error: redefinition of 'huge_ptep_set_wrprotect'
include2/asm/pgtable-ppc64.h:317: error: previous definition of 'huge_ptep_set_wrprotect' was here

Caused by the actual merge of the powerpc tree due to commit
86df86424939d316b1f6cfac1b6204f0c7dee317 ("Correct hash flushing from
huge_ptep_set_wrprotect()") from Linus' tree merging with commit
016b33c4958681c24056abed8ec95844a0da80a3 ("powerpc: Add 64 bit version of
huge_ptep_set_wrprotect") from the powerpc tree.

I fixed it up in the actual merge commit.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: powerpc tree build failure

[Stephen Rothwell]

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

Hi Ben,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

arch/powerpc/mm/mmu_context_hash64.c: In function 'destroy_context':
arch/powerpc/mm/mmu_context_hash64.c:96: error: passing argument 1 of 'subpage_prot_free' from incompatible pointer type
arch/powerpc/include/asm/mmu-hash64.h:404: note: expected 'pgd_t *' but argument is of type 'struct mm_struct *'

Casued by commit c045256d146800ea1d741a8e9e377dada6b7e195 ("powerpc/mm:
Fix bug in pagetable cache cleanup with CONFIG_PPC_SUBPAGE_PROT") which I
have reverted for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]