Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757095Ab2JRQ0v (ORCPT ); Thu, 18 Oct 2012 12:26:51 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:34482 "EHLO e06smtp10.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756255Ab2JRQ0u (ORCPT ); Thu, 18 Oct 2012 12:26:50 -0400 Date: Thu, 18 Oct 2012 18:26:42 +0200 From: Gerald Schaefer To: Stephen Rothwell Cc: Martin Schwidefsky , Heiko Carstens , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ralf Baechle Subject: Re: linux-next: build failure after merge of the final tree (tip/s390 trees related) Message-ID: <20121018182642.2a541275@thinkpad> In-Reply-To: <20121018172201.b81dcc8fe40868256f532364@canb.auug.org.au> References: <20121018172201.b81dcc8fe40868256f532364@canb.auug.org.au> Reply-To: gerald.schaefer@de.ibm.com X-Mailer: Claws Mail 3.7.9 (GTK+ 2.24.6; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit x-cbid: 12101816-4966-0000-0000-000003D10D69 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2340 Lines: 68 On Thu, 18 Oct 2012 17:22:01 +1100 Stephen Rothwell wrote: > Hi all, > > 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 --- arch/s390/include/asm/pgtable.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index f8887ab..2846920 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -1250,6 +1250,19 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, *pmdp = entry; } +static inline pgprot_t pmd_pgprot(pmd_t pmd) +{ + pgprot_t prot = PAGE_RW; + + if (pmd_val(pmd) & _SEGMENT_ENTRY_RO) { + if (pmd_val(pmd) & _SEGMENT_ENTRY_INV) + prot = PAGE_NONE; + else + prot = PAGE_RO; + } + return prot; +} + static inline unsigned long massage_pgprot_pmd(pgprot_t pgprot) { unsigned long pgprot_pmd = 0; -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/