From 4d79a23229e90083ba3761eda1d75887b5fabd5b Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 5 Sep 2008 09:30:14 -0700 Subject: [PATCH] --- yaml --- r: 109735 b: refs/heads/master c: 14469a8dd23677921db5e7354a602c98d9c6300f h: refs/heads/master i: 109733: 4f22ef4f7385c2b0d60f56f4a175727edfc6d25d 109731: 8e775b474d6e29ab69c7c0af4157ff452d561f74 109727: e8184dd7c871aafbc69d97bf3c8765c4983c2b9f v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig.cpu | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 56638d97dfb8..e89b7bd54d0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0253398ca1df7e1d2bfbb452175c964a0862482c +refs/heads/master: 14469a8dd23677921db5e7354a602c98d9c6300f diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu index 2c518fbc52ec..b225219c448c 100644 --- a/trunk/arch/x86/Kconfig.cpu +++ b/trunk/arch/x86/Kconfig.cpu @@ -382,14 +382,17 @@ config X86_OOSTORE # P6_NOPs are a relatively minor optimization that require a family >= # 6 processor, except that it is broken on certain VIA chips. # Furthermore, AMD chips prefer a totally different sequence of NOPs -# (which work on all CPUs). As a result, disallow these if we're -# compiling X86_GENERIC but not X86_64 (these NOPs do work on all -# x86-64 capable chips); the list of processors in the right-hand clause -# are the cores that benefit from this optimization. +# (which work on all CPUs). In addition, it looks like Virtual PC +# does not understand them. +# +# As a result, disallow these if we're not compiling for X86_64 (these +# NOPs do work on all x86-64 capable chips); the list of processors in +# the right-hand clause are the cores that benefit from this optimization. # config X86_P6_NOP def_bool y - depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC) + depends on X86_64 + depends on (MCORE2 || MPENTIUM4 || MPSC) config X86_TSC def_bool y