diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 02:54:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 02:54:55 +0000 |
| commit | 493c987f7a352ca64fdb4dc03a21e24cbaf46f55 (patch) | |
| tree | 184cddc0925e082c0500afd042f92e9f340fe890 /arch/i386/config.in | |
| parent | 2d25612a92c62b5708d6d43f38d28c6141173328 (diff) | |
Merge with Linux 2.4.0-pre3-test6.
Diffstat (limited to 'arch/i386/config.in')
| -rw-r--r-- | arch/i386/config.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index 7344e802c..a2252d7af 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -34,6 +34,7 @@ choice 'Processor family' \ # Define implied options from the CPU selection here # if [ "$CONFIG_M386" = "y" ]; then + define_bool CONFIG_X86_CMPXCHG n define_int CONFIG_X86_L1_CACHE_BYTES 16 else define_bool CONFIG_X86_WP_WORKS_OK y @@ -139,6 +140,9 @@ if [ "$CONFIG_SMP" != "y" ]; then define_bool CONFIG_X86_LOCAL_APIC y fi fi +if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then + define_bool CONFIG_HAVE_DEC_LOCK y +fi endmenu mainmenu_option next_comment |