lkml.org 
[lkml]   [2012]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: build failure after merge of the final tree (tip/s390 trees related)
    Hi Gerald,

    On Thu, 18 Oct 2012 18:26:42 +0200 Gerald Schaefer <gerald.schaefer@de.ibm.com> wrote:
    >
    > On Thu, 18 Oct 2012 17:22:01 +1100
    > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
    >
    > > After merging the final tree, today's linux-next build (s390 allyesconfig)
    > > failed like this:
    > >
    > > 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'
    > >
    > > (see http://kisskb.ellerman.id.au/kisskb/buildresult/7383823/)
    > >
    > > 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.
    > >
    > > Anyone have suggested merge fix patches I can apply?
    >
    > Subject: [PATCH] s390/thp: implement pmd_pgprot() for s390
    >
    > git commit "mm/thp: Preserve pgprot across huge page split" in
    > linux-next introduced a pmd_pgprot() function, which is missing on
    > s390, resulting in a compile error when transparent huge pages are
    > enabled. This patch adds an implementation of pmd_pgprot() for s390.
    >
    > Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>

    I have added that to linux-next today as a merge fix.

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-10-19 05:41    [W:4.206 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site