diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /include/asm-i386 | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/bugs.h | 16 | ||||
| -rw-r--r-- | include/asm-i386/setup.h | 4 |
2 files changed, 4 insertions, 16 deletions
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h index 2ceaa977d..046fd5278 100644 --- a/include/asm-i386/bugs.h +++ b/include/asm-i386/bugs.h @@ -356,22 +356,6 @@ __initfunc(static void check_cyrix_cpu(void)) __initfunc(static void check_cyrix_coma(void)) { - if (boot_cpu_data.coma_bug) { - unsigned char ccr3, tmp; - cli(); - ccr3 = getCx86(CX86_CCR3); - setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ - tmp = getCx86(0x31); - setCx86(0x31, tmp | 0xf8); - tmp = getCx86(0x32); - setCx86(0x32, tmp | 0x7f); - setCx86(0x33, 0); - tmp = getCx86(0x3c); - setCx86(0x3c, tmp | 0x87); - setCx86(CX86_CCR3, ccr3); /* disable MAPEN */ - sti(); - printk("Cyrix processor with \"coma bug\" found, workaround enabled\n"); - } } /* diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h new file mode 100644 index 000000000..fc1244493 --- /dev/null +++ b/include/asm-i386/setup.h @@ -0,0 +1,4 @@ +/* + * Just a place holder. We don't want to have to test x86 before + * we include stuff + */ |