From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Tseng-Hui (Frank) Lin" <thlin@linux.vnet.ibm.com>,
Sonny Rao <sonnyrao@linux.vnet.ibm.com>,
Anton Blanchard <anton@samba.org>,
Michael Ellerman <michael@ozlabs.org>
Subject: linux-next: build failure after merge of the final tree (powerpc tree related)
Date: Thu, 5 May 2011 13:41:42 +1000 [thread overview]
Message-ID: <20110505134142.3a1cb1f9.sfr@canb.auug.org.au> (raw)
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@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.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@canb.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
next reply other threads:[~2011-05-05 3:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-05 3:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-12-09 6:32 linux-next: build failure after merge of the final tree (powerpc tree related) Stephen Rothwell
2013-01-11 5:52 Stephen Rothwell
2013-01-11 6:04 ` Michael Neuling
2012-09-06 7:11 Stephen Rothwell
2012-09-06 8:20 ` Ananth N Mavinakayanahalli
2011-06-30 6:36 Stephen Rothwell
2011-06-30 7:09 ` Benjamin Herrenschmidt
2011-03-14 9:38 Stephen Rothwell
2011-03-14 20:37 ` Benjamin Herrenschmidt
2011-03-14 20:51 ` David Miller
2011-03-14 21:17 ` Thomas Gleixner
2011-03-14 21:21 ` Lennert Buytenhek
2010-12-03 5:32 Stephen Rothwell
2010-12-03 5:59 ` Benjamin Herrenschmidt
2010-12-03 6:08 ` Stephen Rothwell
2010-12-03 11:26 ` Josh Boyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110505134142.3a1cb1f9.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=anton@samba.org \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=michael@ozlabs.org \
--cc=paulus@samba.org \
--cc=sonnyrao@linux.vnet.ibm.com \
--cc=thlin@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).