patch-1.3.99 linux/include/asm-m68k/pgtable.h

Next file: linux/include/asm-m68k/serial.h
Previous file: linux/include/asm-m68k/elf.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.98/linux/include/asm-m68k/pgtable.h linux/include/asm-m68k/pgtable.h
@@ -14,7 +14,6 @@
 		__asm__ __volatile__("pflusha\n"::); \
 } while (0)
 
-#if 1
 static inline void __flush_tlb_one(unsigned long addr)
 {
 	if (m68k_is040or060) {
@@ -24,9 +23,6 @@
 	} else
 		__asm__ __volatile__("pflush #0,#0,(%0)" : : "a" (addr));
 }
-#else
-#define __flush_tlb_one(addr) __flush_tlb()
-#endif
 
 #define flush_tlb() __flush_tlb()
 #define flush_tlb_all() flush_tlb()
@@ -573,15 +569,14 @@
 
 /*
  * I don't know what is going on here, but since these were changed,
- * swapping haven't been working on the 68040.
+ * swapping hasn't been working on the 68040.
  */
 
-#if 0
 #define SWP_TYPE(entry)  (((entry) >> 2) & 0x7f)
+#if 0
 #define SWP_OFFSET(entry) ((entry) >> 9)
 #define SWP_ENTRY(type,offset) (((type) << 2) | ((offset) << 9))
 #else
-#define SWP_TYPE(entry)  (((entry) & 0x1fc) >> 2)
 #define SWP_OFFSET(entry) ((entry) >> PAGE_SHIFT)
 #define SWP_ENTRY(type,offset) (((type) << 2) | ((offset) << PAGE_SHIFT))
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this