uml: fold mmu_context_skas into mm_context

[linux-2.6.git] / include / asm-um / mmu_context.h

diff --git a/include/asm-um/mmu_context.h b/include/asm-um/mmu_context.h
index 035fd1c363ea52bd11519fb9d6d44209bb92da5f..5f3b863aef9aeeafb40c8ee168addf2d6309ecd1 100644 (file)
--- a/include/asm-um/mmu_context.h
+++ b/include/asm-um/mmu_context.h
@@ -29,7 +29,7 @@ static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)
         * possible.
         */
        if (old != new && (current->flags & PF_BORROWED_MM))
         * possible.
         */
        if (old != new && (current->flags & PF_BORROWED_MM))

-               __switch_mm(&new->context.skas.id);
+               __switch_mm(&new->context.id);

 }
 
 static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
 }
 
 static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 


@@ -41,7 +41,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
                cpu_clear(cpu, prev->cpu_vm_mask);
                cpu_set(cpu, next->cpu_vm_mask);
                if(next != &init_mm)
                cpu_clear(cpu, prev->cpu_vm_mask);
                cpu_set(cpu, next->cpu_vm_mask);
                if(next != &init_mm)

-                       __switch_mm(&next->context.skas.id);
+                       __switch_mm(&next->context.id);

        }
 }
 
        }
 }