diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-05 20:39:08 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-05 23:18:34 -0400 |
commit | 79af2187fa27442e89437d8ee637578cdb1a036c (patch) | |
tree | 4a2b164956f68af9dc680ccef1ad0affbc41e4e9 /arch/powerpc/mm/mmu_context_hash64.c | |
parent | cce36444173b943f7b27e726ab38b3340cdebc41 (diff) |
powerpc: Fix compile with icwsx support
Due to a collision between NO_CONTEXT->MMU_NO_CONTEXT change and
Anton's patch.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm/mmu_context_hash64.c')
-rw-r--r-- | 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 c517815404c4..3bafc3deca6d 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) | |||
279 | if (!mm->context.cop_lockp) { | 279 | if (!mm->context.cop_lockp) { |
280 | __destroy_context(index); | 280 | __destroy_context(index); |
281 | subpage_prot_free(mm); | 281 | subpage_prot_free(mm); |
282 | mm->context.id = NO_CONTEXT; | 282 | mm->context.id = MMU_NO_CONTEXT; |
283 | return -ENOMEM; | 283 | return -ENOMEM; |
284 | } | 284 | } |
285 | spin_lock_init(mm->context.cop_lockp); | 285 | spin_lock_init(mm->context.cop_lockp); |