patch-2.1.100 linux/include/asm-ppc/mmu_context.h

• Lines: 70
• Date: Tue May 5 21:33:34 1998
• Orig file: v2.1.99/linux/include/asm-ppc/mmu_context.h
• Orig date: Sat Apr 25 18:13:12 1998

diff -u --recursive --new-file v2.1.99/linux/include/asm-ppc/mmu_context.h linux/include/asm-ppc/mmu_context.h
@@ -22,9 +22,20 @@
 #ifdef CONFIG_8xx
 #define NO_CONTEXT      16
 #define LAST_CONTEXT    15
+#define MUNGE_CONTEXT(n)        (n)
+
 #else
+
+/* PPC 6xx, 7xx CPUs */
 #define NO_CONTEXT      0
 #define LAST_CONTEXT    0xfffff
+
+/*
+ * Allocating context numbers this way tends to spread out
+ * the entries in the hash table better than a simple linear
+ * allocation.
+ */
+#define MUNGE_CONTEXT(n)        (((n) * 897) & LAST_CONTEXT)
 #endif
 
 extern int next_mmu_context;
@@ -36,17 +47,6 @@
 #define set_context(context)    do { } while (0)
 #endif
 
-#ifndef CONFIG_8xx
-/*
- * Allocating context numbers this way tends to spread out
- * the entries in the hash table better than a simple linear
- * allocation.
- */
-#define MUNGE_CONTEXT(n)        (((n) * 897) & LAST_CONTEXT)
-#else
-#define MUNGE_CONTEXT(n)        (n)
-#endif
-
 /*
  * Get a new mmu context for task tsk if necessary.
  */
@@ -57,8 +57,6 @@
 		if (next_mmu_context == LAST_CONTEXT)		\
 			mmu_context_overflow();			\
 		mm->context = MUNGE_CONTEXT(++next_mmu_context);\
-	 	if ( tsk == current )                           \
-			set_context(mm->context);               \
 	}							\
 } while (0)
 
@@ -70,11 +68,17 @@
 /*
  * We're finished using the context for an address space.
  */
-#ifdef CONFIG_8xx
 #define destroy_context(mm)     ((mm)->context = NO_CONTEXT)
-#else
-#define destroy_context(mm)     do { } while (0)
-#endif
+
+/*
+ * After we have set current->mm to a new value, this activates
+ * the context for the new mm so we see the new mappings.
+ */
+extern inline void activate_context(struct task_struct *tsk)
+{
+	get_mmu_context(tsk);
+	set_context(tsk->mm->context);
+}
 
 /*
  * compute the vsid from the context and segment