powerpc: Fix compile with icwsx support
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 6 May 2011 00:39:08 +0000 (10:39 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 6 May 2011 03:18:34 +0000 (13:18 +1000)
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>
arch/powerpc/mm/mmu_context_hash64.c

index c517815404c4fe97242f29315be41f8df9ea8c58..3bafc3deca6d66478161cca9db8bc2fb9107173a 100644 (file)
@@ -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);