Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

1 files changed, 4 insertions, 21 deletions

diff --git a/include/asm-m68k/mmu_context.h b/include/asm-m68k/mmu_context.h
index 003933fae..0e7dcd886 100644
--- a/include/asm-m68k/mmu_context.h
+++ b/include/asm-m68k/mmu_context.h
@@ -3,15 +3,16 @@
 
 #include <linux/config.h>
 
+static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk, unsigned cpu)
+{
+}
+
 #ifndef CONFIG_SUN3
 
 #include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
 
-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk, unsigned cpu)
-{
-}
 extern inline int
 init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
@@ -105,8 +106,6 @@ extern inline void activate_mm(struct mm_struct *prev_mm,
 
 extern unsigned long get_free_context(struct mm_struct *mm);
 extern void clear_context(unsigned long context);
-extern unsigned char ctx_next_to_die;
-extern unsigned char ctx_live[SUN3_CONTEXTS_NUM];
 
 /* set the context for a new task to unmapped */
 static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
@@ -123,28 +122,12 @@ static inline void get_mmu_context(struct mm_struct *mm)
 		mm->context = get_free_context(mm);
 }
 
-#if 0
-/* we used to clear the context after the process exited.  we still
-   should, things are faster that way...  but very unstable.  so just
-   clear out a context next time we need a new one..  consider this a
-   FIXME. */
-
 /* flush context if allocated... */	
 static inline void destroy_context(struct mm_struct *mm)
 {
 	if(mm->context != SUN3_INVALID_CONTEXT)
 		clear_context(mm->context);
 }
-#else
-/* mark this context as dropped and set it for next death */
-static inline void destroy_context(struct mm_struct *mm) 
-{
-	if(mm->context != SUN3_INVALID_CONTEXT) {
-		ctx_next_to_die = mm->context;
-		ctx_live[mm->context] = 0;
-	}
-}
-#endif
 
 static inline void activate_context(struct mm_struct *mm)
 {