patch-2.4.10 linux/drivers/char/mem.c

• Lines: 38
• Date: Fri Sep 14 14:04:07 2001
• Orig file: v2.4.9/linux/drivers/char/mem.c
• Orig date: Sun Aug 12 13:27:59 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -41,9 +41,6 @@
 #if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
 extern void tapechar_init(void);
 #endif
-#if defined(CONFIG_ADB)
-extern void adbdev_init(void);
-#endif
      
 static ssize_t do_write_mem(struct file * file, void *p, unsigned long realp,
 			    const char * buf, size_t count, loff_t *ppos)
@@ -134,7 +131,7 @@
 {
 	unsigned long prot = pgprot_val(_prot);
 
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 	/* On PPro and successors, PCD alone doesn't always mean 
 	    uncached because of interactions with the MTRRs. PCD | PWT
 	    means definitely uncached. */ 
@@ -153,8 +150,6 @@
 	/* Use no-cache mode, serialized */
 	else if (MMU_IS_040 || MMU_IS_060)
 		prot = (prot & _CACHEMASK040) | _PAGE_NOCACHE_S;
-#elif defined(__mips__)
-	prot = (prot & ~_CACHE_MASK) | _CACHE_UNCACHED;
 #endif
 
 	return __pgprot(prot);
@@ -640,9 +635,6 @@
 #endif
 #if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
 	tapechar_init();
-#endif
-#if defined(CONFIG_ADB)
-	adbdev_init();
 #endif
 	return 0;
 }