>From Hiroshi Miura <[email protected]>
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/kernel/cpu/cyrix.c linux-2.5/arch/i386/kernel/cpu/cyrix.c
--- bk-linus/arch/i386/kernel/cpu/cyrix.c 2003-04-10 06:01:09.000000000 +0100
+++ linux-2.5/arch/i386/kernel/cpu/cyrix.c 2003-07-13 06:03:44.000000000 +0100
@@ -109,7 +109,6 @@ static void __init check_cx686_slop(stru
static void __init set_cx86_reorder(void)
{
-#ifdef CONFIG_OOSTORE
u8 ccr3;
printk(KERN_INFO "Enable Memory access reorder on Cyrix/NSC processor.\n");
@@ -118,12 +117,9 @@ static void __init set_cx86_reorder(void
/* Load/Store Serialize to mem access disable (=reorder it)? */
setCx86(CX86_PCR0, getCx86(CX86_PCR0) & ~0x80);
-#ifdef CONFIG_NOHIGHMEM
/* set load/store serialize from 1GB to 4GB */
ccr3 |= 0xe0;
-#endif
setCx86(CX86_CCR3, ccr3);
-#endif
}
static void __init set_cx86_memwb(void)