aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-11-28 14:50:23 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2012-11-29 16:23:01 -0500
commiteb068e781020cf491333c773fb41820b57bfada4 (patch)
tree9149af8e1d385d79e4da94d2b969b325c1f81778 /arch/x86/include
parent9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff)
x86, 386 removal: Remove CONFIG_M386 from Kconfig
Remove the CONFIG_M386 symbol from Kconfig so that it cannot be selected. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Link: http://lkml.kernel.org/r/1354132230-21854-2-git-send-email-hpa@linux.intel.com
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/module.h2
-rw-r--r--arch/x86/include/asm/processor.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
index 9eae7752ae9b..e3b7819caeef 100644
--- a/arch/x86/include/asm/module.h
+++ b/arch/x86/include/asm/module.h
@@ -5,8 +5,6 @@
5 5
6#ifdef CONFIG_X86_64 6#ifdef CONFIG_X86_64
7/* X86_64 does not define MODULE_PROC_FAMILY */ 7/* X86_64 does not define MODULE_PROC_FAMILY */
8#elif defined CONFIG_M386
9#define MODULE_PROC_FAMILY "386 "
10#elif defined CONFIG_M486 8#elif defined CONFIG_M486
11#define MODULE_PROC_FAMILY "486 " 9#define MODULE_PROC_FAMILY "486 "
12#elif defined CONFIG_M586 10#elif defined CONFIG_M586
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index ad1fc8511674..9a4ee46959f3 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -672,7 +672,7 @@ static inline void sync_core(void)
672{ 672{
673 int tmp; 673 int tmp;
674 674
675#if defined(CONFIG_M386) || defined(CONFIG_M486) 675#ifdef CONFIG_M486
676 if (boot_cpu_data.x86 < 5) 676 if (boot_cpu_data.x86 < 5)
677 /* There is no speculative execution. 677 /* There is no speculative execution.
678 * jmp is a barrier to prefetching. */ 678 * jmp is a barrier to prefetching. */