Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Hi Ingo, On Sat, 20 Oct 2012 00:43:45 +0200 Ingo Molnar wrote: > > * Stephen Rothwell wrote: > > > It looks as though you have not gone back far enough - you > > removed a couple of merges of sched/numa, but there are more. > > I have two of the problems resolved with merge patches that > > supply pmd_pgprot() for s390 and mips, but there is another > > problem with mips (see Ralf's other email). > > Yeah. All of this should be resolved now in principle. Next time > you'll integrate linux-next is on Monday, right? Excellent, thanks. Yes, the next linux-next will be Monday (my time). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpQ6y8YqJolr.pgp Description: PGP signature
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Hi Ingo, On Sat, 20 Oct 2012 00:39:38 +0200 Ingo Molnar wrote: > > From 7fc4d49214dba401f4b92ed62da60a5b257a653a Mon Sep 17 00:00:00 2001 > From: Ingo Molnar > Date: Sat, 20 Oct 2012 00:33:01 +0200 > Subject: [PATCH] MIPS/thp: Fix update_mmu_cache() cache call > > As per recent upstream commit: > > b113da65785d mm: Add and use update_mmu_cache_pmd() in transparent huge > page code. > > The call in do_huge_pmd_prot_none() needs to call update_mmu_cache_pmd() > as well. > > This resolves a MIPS build error triggered on linux-next. > > Reported-by: Ralf Baechle > Reported-by: Stephen Rothwell Just a small nit - I didn't actually report this one, just Ralf did. Thanks for the fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgponCKAQ4jdA.pgp Description: PGP signature
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Stephen Rothwell wrote:
> Hi Ingo,
>
> On Thu, 18 Oct 2012 20:29:53 +0200 Ingo Molnar wrote:
> >
> > * Stephen Rothwell 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?
> >
> > Resolved it for now by excluding those changes, will put them
> > back in once they are fixed.
>
> It looks as though you have not gone back far enough - you
> removed a couple of merges of sched/numa, but there are more.
> I have two of the problems resolved with merge patches that
> supply pmd_pgprot() for s390 and mips, but there is another
> problem with mips (see Ralf's other email).
Yeah. All of this should be resolved now in principle. Next time
you'll integrate linux-next is on Monday, right?
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Actually, there's two sites - find the updated patch below. Thanks, Ingo ---> >From 7fc4d49214dba401f4b92ed62da60a5b257a653a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sat, 20 Oct 2012 00:33:01 +0200 Subject: [PATCH] MIPS/thp: Fix update_mmu_cache() cache call As per recent upstream commit: b113da65785d mm: Add and use update_mmu_cache_pmd() in transparent huge page code. The call in do_huge_pmd_prot_none() needs to call update_mmu_cache_pmd() as well. This resolves a MIPS build error triggered on linux-next. Reported-by: Ralf Baechle Reported-by: Stephen Rothwell Acked-by: Peter Zijlstra Link: http://lkml.kernel.org/r/20121018145101.ga17...@linux-mips.org Signed-off-by: Ingo Molnar --- mm/huge_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8100c01..1068e78 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -770,7 +770,7 @@ fixup: /* change back to regular protection */ entry = pmd_modify(entry, vma->vm_page_prot); set_pmd_at(mm, haddr, pmd, entry); - update_mmu_cache(vma, address, entry); + update_mmu_cache_pmd(vma, address, entry); unlock: spin_unlock(>page_table_lock); @@ -846,7 +846,7 @@ migrate: page_add_new_anon_rmap(new_page, vma, haddr); set_pmd_at(mm, haddr, pmd, entry); - update_mmu_cache(vma, address, entry); + update_mmu_cache_pmd(vma, address, entry); page_remove_rmap(page); spin_unlock(>page_table_lock); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Peter Zijlstra wrote: > On Thu, 2012-10-18 at 17:02 +0200, Ralf Baechle wrote: > > 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??? > > That appears to have become update_mmu_cache_pmd(), which > makes sense given that there's now architectures that care > about it. Ok, I fixed it as per below. Does everyone agree? Thanks, Ingo > >From 6e683978132907ff339e8a01a4d901c75709e62c Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sat, 20 Oct 2012 00:33:01 +0200 Subject: [PATCH] MIPS/thp: Fix update_mmu_cache() cache call As per recent upstream commit: b113da65785d mm: Add and use update_mmu_cache_pmd() in transparent huge page code. The call in do_huge_pmd_prot_none() needs to call update_mmu_cache_pmd() as well. This resolves a MIPS build error triggered on linux-next. Reported-by: Ralf Baechle Reported-by: Stephen Rothwell Acked-by: Peter Zijlstra Link: http://lkml.kernel.org/r/20121018145101.ga17...@linux-mips.org Signed-off-by: Ingo Molnar --- mm/huge_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8100c01..57c5018 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -770,7 +770,7 @@ fixup: /* change back to regular protection */ entry = pmd_modify(entry, vma->vm_page_prot); set_pmd_at(mm, haddr, pmd, entry); - update_mmu_cache(vma, address, entry); + update_mmu_cache_pmd(vma, address, entry); unlock: spin_unlock(>page_table_lock); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
On Thu, 2012-10-18 at 17:02 +0200, Ralf Baechle wrote: > 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’ That appears to have become update_mmu_cache_pmd(), which makes sense given that there's now architectures that care about it. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Ralf Baechle wrote:
> On Thu, Oct 18, 2012 at 05:22:01PM +1100, Stephen Rothwell 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?
>
> See below. There's further MIPS breakage in -next; more on than in a
> separate email.
>
> Ralf
>
> Signed-off-by: Ralf Baechle
Thanks Ralf! I've applied it, with a changelog and a
Reported-by: Stephen Rothwell line - see the commit below.
Note that I moved the definition slightly up, so that regardless
of the order merging the commits don't create a conflict in
linux-next. If that fine with you I'll push it out that way.
(Looking at the other MIPS problem as well.)
Thanks,
Ingo
>
>From 8cd7680d8b7241941fd51d83302677d58b447223 Mon Sep 17 00:00:00 2001
From: Ralf Baechle
Date: Thu, 18 Oct 2012 16:51:01 +0200
Subject: [PATCH] MIPS/thp: Add pmd_pgprot() implementation
Resolve the semantic conflict between the new THP code
on MIPS and the new NUMA code, in linux-next, by adding
the pmd_pgprot() method needed by the NUMA code.
Reported-by: Stephen Rothwell
Signed-off-by: Ralf Baechle
Cc: Martin Schwidefsky
Cc: Heiko Carstens
Cc: Peter Zijlstra
Link: http://lkml.kernel.org/r/20121018145101.ga17...@linux-mips.org
Signed-off-by: Ingo Molnar
---
arch/mips/include/asm/pgtable.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index c02158b..bbe4cda 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -89,6 +89,8 @@ static inline int is_zero_pfn(unsigned long pfn)
extern void paging_init(void);
+#define pmd_pgprot(x) __pgprot(pmd_val(x) & ~_PAGE_CHG_MASK)
+
/*
* Conversion functions: convert a page and protection to a page entry,
* and a page entry and page directory to the page they refer to.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Gerald Schaefer wrote:
> 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
Thanks Gerald! I'll merge this as well so that the semantic
conflict disappears from linux-next.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Gerald Schaefer gerald.schae...@de.ibm.com wrote: On Thu, 18 Oct 2012 17:22:01 +1100 Stephen Rothwell s...@canb.auug.org.au 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 Thanks Gerald! I'll merge this as well so that the semantic conflict disappears from linux-next. Thanks, Ingo -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Ralf Baechle r...@linux-mips.org wrote: On Thu, Oct 18, 2012 at 05:22:01PM +1100, Stephen Rothwell 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? See below. There's further MIPS breakage in -next; more on than in a separate email. Ralf Signed-off-by: Ralf Baechle r...@linux-mips.org Thanks Ralf! I've applied it, with a changelog and a Reported-by: Stephen Rothwell line - see the commit below. Note that I moved the definition slightly up, so that regardless of the order merging the commits don't create a conflict in linux-next. If that fine with you I'll push it out that way. (Looking at the other MIPS problem as well.) Thanks, Ingo From 8cd7680d8b7241941fd51d83302677d58b447223 Mon Sep 17 00:00:00 2001 From: Ralf Baechle r...@linux-mips.org Date: Thu, 18 Oct 2012 16:51:01 +0200 Subject: [PATCH] MIPS/thp: Add pmd_pgprot() implementation Resolve the semantic conflict between the new THP code on MIPS and the new NUMA code, in linux-next, by adding the pmd_pgprot() method needed by the NUMA code. Reported-by: Stephen Rothwell s...@canb.auug.org.au Signed-off-by: Ralf Baechle r...@linux-mips.org Cc: Martin Schwidefsky schwidef...@de.ibm.com Cc: Heiko Carstens heiko.carst...@de.ibm.com Cc: Peter Zijlstra pet...@infradead.org Link: http://lkml.kernel.org/r/20121018145101.ga17...@linux-mips.org Signed-off-by: Ingo Molnar mi...@kernel.org --- arch/mips/include/asm/pgtable.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h index c02158b..bbe4cda 100644 --- a/arch/mips/include/asm/pgtable.h +++ b/arch/mips/include/asm/pgtable.h @@ -89,6 +89,8 @@ static inline int is_zero_pfn(unsigned long pfn) extern void paging_init(void); +#define pmd_pgprot(x) __pgprot(pmd_val(x) ~_PAGE_CHG_MASK) + /* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
On Thu, 2012-10-18 at 17:02 +0200, Ralf Baechle wrote: 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’ That appears to have become update_mmu_cache_pmd(), which makes sense given that there's now architectures that care about it. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Peter Zijlstra pet...@infradead.org wrote: On Thu, 2012-10-18 at 17:02 +0200, Ralf Baechle wrote: 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??? That appears to have become update_mmu_cache_pmd(), which makes sense given that there's now architectures that care about it. Ok, I fixed it as per below. Does everyone agree? Thanks, Ingo From 6e683978132907ff339e8a01a4d901c75709e62c Mon Sep 17 00:00:00 2001 From: Ingo Molnar mi...@kernel.org Date: Sat, 20 Oct 2012 00:33:01 +0200 Subject: [PATCH] MIPS/thp: Fix update_mmu_cache() cache call As per recent upstream commit: b113da65785d mm: Add and use update_mmu_cache_pmd() in transparent huge page code. The call in do_huge_pmd_prot_none() needs to call update_mmu_cache_pmd() as well. This resolves a MIPS build error triggered on linux-next. Reported-by: Ralf Baechle r...@linux-mips.org Reported-by: Stephen Rothwell s...@canb.auug.org.au Acked-by: Peter Zijlstra pet...@infradead.org Link: http://lkml.kernel.org/r/20121018145101.ga17...@linux-mips.org Signed-off-by: Ingo Molnar mi...@kernel.org --- mm/huge_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8100c01..57c5018 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -770,7 +770,7 @@ fixup: /* change back to regular protection */ entry = pmd_modify(entry, vma-vm_page_prot); set_pmd_at(mm, haddr, pmd, entry); - update_mmu_cache(vma, address, entry); + update_mmu_cache_pmd(vma, address, entry); unlock: spin_unlock(mm-page_table_lock); -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Actually, there's two sites - find the updated patch below. Thanks, Ingo --- From 7fc4d49214dba401f4b92ed62da60a5b257a653a Mon Sep 17 00:00:00 2001 From: Ingo Molnar mi...@kernel.org Date: Sat, 20 Oct 2012 00:33:01 +0200 Subject: [PATCH] MIPS/thp: Fix update_mmu_cache() cache call As per recent upstream commit: b113da65785d mm: Add and use update_mmu_cache_pmd() in transparent huge page code. The call in do_huge_pmd_prot_none() needs to call update_mmu_cache_pmd() as well. This resolves a MIPS build error triggered on linux-next. Reported-by: Ralf Baechle r...@linux-mips.org Reported-by: Stephen Rothwell s...@canb.auug.org.au Acked-by: Peter Zijlstra pet...@infradead.org Link: http://lkml.kernel.org/r/20121018145101.ga17...@linux-mips.org Signed-off-by: Ingo Molnar mi...@kernel.org --- mm/huge_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8100c01..1068e78 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -770,7 +770,7 @@ fixup: /* change back to regular protection */ entry = pmd_modify(entry, vma-vm_page_prot); set_pmd_at(mm, haddr, pmd, entry); - update_mmu_cache(vma, address, entry); + update_mmu_cache_pmd(vma, address, entry); unlock: spin_unlock(mm-page_table_lock); @@ -846,7 +846,7 @@ migrate: page_add_new_anon_rmap(new_page, vma, haddr); set_pmd_at(mm, haddr, pmd, entry); - update_mmu_cache(vma, address, entry); + update_mmu_cache_pmd(vma, address, entry); page_remove_rmap(page); spin_unlock(mm-page_table_lock); -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Stephen Rothwell s...@canb.auug.org.au wrote: Hi Ingo, On Thu, 18 Oct 2012 20:29:53 +0200 Ingo Molnar mi...@kernel.org wrote: * Stephen Rothwell s...@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? Resolved it for now by excluding those changes, will put them back in once they are fixed. It looks as though you have not gone back far enough - you removed a couple of merges of sched/numa, but there are more. I have two of the problems resolved with merge patches that supply pmd_pgprot() for s390 and mips, but there is another problem with mips (see Ralf's other email). Yeah. All of this should be resolved now in principle. Next time you'll integrate linux-next is on Monday, right? Thanks, Ingo -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Hi Ingo, On Sat, 20 Oct 2012 00:39:38 +0200 Ingo Molnar mi...@kernel.org wrote: From 7fc4d49214dba401f4b92ed62da60a5b257a653a Mon Sep 17 00:00:00 2001 From: Ingo Molnar mi...@kernel.org Date: Sat, 20 Oct 2012 00:33:01 +0200 Subject: [PATCH] MIPS/thp: Fix update_mmu_cache() cache call As per recent upstream commit: b113da65785d mm: Add and use update_mmu_cache_pmd() in transparent huge page code. The call in do_huge_pmd_prot_none() needs to call update_mmu_cache_pmd() as well. This resolves a MIPS build error triggered on linux-next. Reported-by: Ralf Baechle r...@linux-mips.org Reported-by: Stephen Rothwell s...@canb.auug.org.au Just a small nit - I didn't actually report this one, just Ralf did. Thanks for the fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgponCKAQ4jdA.pgp Description: PGP signature
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Hi Ingo, On Sat, 20 Oct 2012 00:43:45 +0200 Ingo Molnar mi...@kernel.org wrote: * Stephen Rothwell s...@canb.auug.org.au wrote: It looks as though you have not gone back far enough - you removed a couple of merges of sched/numa, but there are more. I have two of the problems resolved with merge patches that supply pmd_pgprot() for s390 and mips, but there is another problem with mips (see Ralf's other email). Yeah. All of this should be resolved now in principle. Next time you'll integrate linux-next is on Monday, right? Excellent, thanks. Yes, the next linux-next will be Monday (my time). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpQ6y8YqJolr.pgp Description: PGP signature
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Hi Ingo,
On Thu, 18 Oct 2012 20:29:53 +0200 Ingo Molnar wrote:
>
> * Stephen Rothwell 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?
>
> Resolved it for now by excluding those changes, will put them
> back in once they are fixed.
It looks as though you have not gone back far enough - you removed a
couple of merges of sched/numa, but there are more. I have two of the
problems resolved with merge patches that supply pmd_pgprot() for s390
and mips, but there is another problem with mips (see Ralf's other email).
Also, I suspect that if you do exclude all the sched/numa changes it will
make a mess of Andrew's mmotm (as it basically sits on top of linux-next).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpV6Y0Orv35v.pgp
Description: PGP signature
Re: 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
wrote:
>
> On Thu, 18 Oct 2012 17:22:01 +1100
> Stephen Rothwell 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
I have added that to linux-next today as a merge fix.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp9UA9v56GQ0.pgp
Description: PGP signature
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Hi Ralf,
On Thu, 18 Oct 2012 16:51:01 +0200 Ralf Baechle wrote:
>
> On Thu, Oct 18, 2012 at 05:22:01PM +1100, Stephen Rothwell 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?
>
> See below.
I have added that to linux-next today as a merge fix.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpEuWRci3ylX.pgp
Description: PGP signature
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* 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?
Resolved it for now by excluding those changes, will put them
back in once they are fixed.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
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
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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
On Thu, Oct 18, 2012 at 05:22:01PM +1100, Stephen Rothwell 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?
See below. There's further MIPS breakage in -next; more on than in a
separate email.
Ralf
Signed-off-by: Ralf Baechle
arch/mips/include/asm/pgtable.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index 252202d..5f7c615 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -534,6 +534,8 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
return pmd;
}
+#define pmd_pgprot(x) __pgprot(pmd_val(x) & ~_PAGE_CHG_MASK)
+
static inline pmd_t pmd_mknotpresent(pmd_t pmd)
{
pmd_val(pmd) &= ~(_PAGE_PRESENT | _PAGE_VALID | _PAGE_DIRTY);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
On Thu, Oct 18, 2012 at 05:22:01PM +1100, Stephen Rothwell 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?
See below. There's further MIPS breakage in -next; more on than in a
separate email.
Ralf
Signed-off-by: Ralf Baechle r...@linux-mips.org
arch/mips/include/asm/pgtable.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index 252202d..5f7c615 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -534,6 +534,8 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
return pmd;
}
+#define pmd_pgprot(x) __pgprot(pmd_val(x) ~_PAGE_CHG_MASK)
+
static inline pmd_t pmd_mknotpresent(pmd_t pmd)
{
pmd_val(pmd) = ~(_PAGE_PRESENT | _PAGE_VALID | _PAGE_DIRTY);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
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.zijls...@chello.nl 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
On Thu, 18 Oct 2012 17:22:01 +1100
Stephen Rothwell s...@canb.auug.org.au 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 gerald.schae...@de.ibm.com
---
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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
* Stephen Rothwell s...@canb.auug.org.au 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? Resolved it for now by excluding those changes, will put them back in once they are fixed. Thanks, Ingo -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Hi Ralf, On Thu, 18 Oct 2012 16:51:01 +0200 Ralf Baechle r...@linux-mips.org wrote: On Thu, Oct 18, 2012 at 05:22:01PM +1100, Stephen Rothwell 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? See below. I have added that to linux-next today as a merge fix. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpEuWRci3ylX.pgp Description: PGP signature
Re: 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.schae...@de.ibm.com wrote: On Thu, 18 Oct 2012 17:22:01 +1100 Stephen Rothwell s...@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.schae...@de.ibm.com I have added that to linux-next today as a merge fix. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp9UA9v56GQ0.pgp Description: PGP signature
Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Hi Ingo, On Thu, 18 Oct 2012 20:29:53 +0200 Ingo Molnar mi...@kernel.org wrote: * Stephen Rothwell s...@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? Resolved it for now by excluding those changes, will put them back in once they are fixed. It looks as though you have not gone back far enough - you removed a couple of merges of sched/numa, but there are more. I have two of the problems resolved with merge patches that supply pmd_pgprot() for s390 and mips, but there is another problem with mips (see Ralf's other email). Also, I suspect that if you do exclude all the sched/numa changes it will make a mess of Andrew's mmotm (as it basically sits on top of linux-next). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpV6Y0Orv35v.pgp Description: PGP signature
