[<prev] [next>] [day] [month] [year] [list]
Date: Thu, 5 May 2011 13:41:42 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
<linuxppc-dev@...ts.ozlabs.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
"Tseng-Hui (Frank) Lin" <thlin@...ux.vnet.ibm.com>,
Sonny Rao <sonnyrao@...ux.vnet.ibm.com>,
Anton Blanchard <anton@...ba.org>,
Michael Ellerman <michael@...abs.org>
Subject: linux-next: build failure after merge of the final tree (powerpc
tree related)
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
arch/powerpc/mm/mmu_context_hash64.c: In function 'init_new_context':
arch/powerpc/mm/mmu_context_hash64.c:282: error: 'NO_CONTEXT' undeclared (first use in this function)
Presumably caused by commit 851d2e2fe8db ("powerpc: Add Initiate
Coprocessor Store Word (icswx) support") interacting with commit
5e8e7b404ac9 ("powerpc/mm: Standardise on MMU_NO_CONTEXT").
I added the below patch for today.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 5 May 2011 13:32:02 +1000
Subject: [PATCH] powerpc: fix up mismerge in mmu_context_hash64.c
NO_CONTEXT was changed to MMU_NO_CONTEXT.
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
arch/powerpc/mm/mmu_context_hash64.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/mm/mmu_context_hash64.c b/arch/powerpc/mm/mmu_context_hash64.c
index c517815..3bafc3d 100644
--- a/arch/powerpc/mm/mmu_context_hash64.c
+++ b/arch/powerpc/mm/mmu_context_hash64.c
@@ -279,7 +279,7 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
if (!mm->context.cop_lockp) {
__destroy_context(index);
subpage_prot_free(mm);
- mm->context.id = NO_CONTEXT;
+ mm->context.id = MMU_NO_CONTEXT;
return -ENOMEM;
}
spin_lock_init(mm->context.cop_lockp);
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists