|
@@ -161,19 +161,19 @@ static void __cpuinit set_cx86_inc(void)
|
|
|
static void __cpuinit geode_configure(void)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
- u8 ccr3, ccr4;
|
|
|
+ u8 ccr3;
|
|
|
local_irq_save(flags);
|
|
|
|
|
|
/* Suspend on halt power saving and enable #SUSP pin */
|
|
|
setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);
|
|
|
|
|
|
ccr3 = getCx86(CX86_CCR3);
|
|
|
- setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* Enable */
|
|
|
-
|
|
|
- ccr4 = getCx86(CX86_CCR4);
|
|
|
- ccr4 |= 0x38; /* FPU fast, DTE cache, Mem bypass */
|
|
|
+ setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
|
|
|
|
|
|
- setCx86(CX86_CCR3, ccr3);
|
|
|
+
|
|
|
+ /* FPU fast, DTE cache, Mem bypass */
|
|
|
+ setCx86(CX86_CCR4, getCx86(CX86_CCR4) | 0x38);
|
|
|
+ setCx86(CX86_CCR3, ccr3); /* disable MAPEN */
|
|
|
|
|
|
set_cx86_memwb();
|
|
|
set_cx86_reorder();
|
|
@@ -420,15 +420,14 @@ static void __cpuinit cyrix_identify(struct cpuinfo_x86 * c)
|
|
|
|
|
|
if (dir0 == 5 || dir0 == 3)
|
|
|
{
|
|
|
- unsigned char ccr3, ccr4;
|
|
|
+ unsigned char ccr3;
|
|
|
unsigned long flags;
|
|
|
printk(KERN_INFO "Enabling CPUID on Cyrix processor.\n");
|
|
|
local_irq_save(flags);
|
|
|
ccr3 = getCx86(CX86_CCR3);
|
|
|
- setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
|
|
|
- ccr4 = getCx86(CX86_CCR4);
|
|
|
- setCx86(CX86_CCR4, ccr4 | 0x80); /* enable cpuid */
|
|
|
- setCx86(CX86_CCR3, ccr3); /* disable MAPEN */
|
|
|
+ setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
|
|
|
+ setCx86(CX86_CCR4, getCx86(CX86_CCR4) | 0x80); /* enable cpuid */
|
|
|
+ setCx86(CX86_CCR3, ccr3); /* disable MAPEN */
|
|
|
local_irq_restore(flags);
|
|
|
}
|
|
|
}
|