diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
| commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
| tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /include/asm-i386/bugs.h | |
| parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) | |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'include/asm-i386/bugs.h')
| -rw-r--r-- | include/asm-i386/bugs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h index 1914385eb..4ae25be50 100644 --- a/include/asm-i386/bugs.h +++ b/include/asm-i386/bugs.h @@ -236,6 +236,7 @@ static void __init check_amd_k6(void) * have the F0 0F bug, which lets nonpriviledged users lock up the system: */ +#ifndef CONFIG_M686 extern void trap_init_f00f_bug(void); static void __init check_pentium_f00f(void) @@ -250,6 +251,7 @@ static void __init check_pentium_f00f(void) trap_init_f00f_bug(); } } +#endif /* * Perform the Cyrix 5/2 test. A Cyrix won't change @@ -424,7 +426,9 @@ static void __init check_bugs(void) check_hlt(); check_popad(); check_amd_k6(); +#ifndef CONFIG_M686 check_pentium_f00f(); +#endif check_cyrix_coma(); system_utsname.machine[1] = '0' + boot_cpu_data.x86; } |