patch-2.4.25 linux-2.4.25/arch/mips/mm/sc-rm7k.c

Next file: linux-2.4.25/arch/mips/mm/tlb-r4k.c
Previous file: linux-2.4.25/arch/mips/mm/pg-sb1.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.24/arch/mips/mm/sc-rm7k.c linux-2.4.25/arch/mips/mm/sc-rm7k.c
@@ -131,7 +131,7 @@
 
 static void rm7k_sc_disable(void)
 {
-	set_c0_config(1<<3);				/* CONF_SE */
+	clear_c0_config(1<<3);				/* CONF_SE */
 }
 
 static inline int __init rm7k_sc_probe(void)
@@ -142,11 +142,11 @@
 	if ((config >> 31) & 1)
 		return 0;
 
-	printk(KERN_INFO "Secondary cache size %ldK, linesize 32 bytes.\n",
+	printk(KERN_INFO "Secondary cache size %ldK, linesize %ld bytes.\n",
 	       (scache_size >> 10), sc_lsize);
 
-	if ((config >> 3) & 1)
-		return;
+	if ((config >> 3) & 1)                          /* CONF_SE */
+		return 1;
 
 	printk(KERN_INFO "Enabling secondary cache...");
 	func();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)