[git pull] x86 fixes

[H. Peter Anvin]

Linus,

Please pull the latest x86-fixes-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus

 Thanks,

	-hpa

------------------>
H. Peter Anvin (1):
      x86: enable CONFIG_X86_GENERIC by default


 arch/x86/Kconfig.cpu |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 2c518fb..46d0acf 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -279,17 +279,18 @@ config GENERIC_CPU
 endchoice
 
 config X86_GENERIC
-	bool "Generic x86 support"
+	bool "Generic x86 support" if EMBEDDED
 	depends on X86_32
+	default y
 	help
-	  Instead of just including optimizations for the selected
-	  x86 variant (e.g. PII, Crusoe or Athlon), include some more
-	  generic optimizations as well. This will make the kernel
-	  perform better on x86 CPUs other than that selected.
-
-	  This is really intended for distributors who need more
-	  generic optimizations.
-
+	  Instead of just including optimizations and workarounds for
+	  the selected x86 variant (e.g. PII, Crusoe or Athlon),
+	  include some more generic optimizations and workarounds as
+	  well.  Without this option, the kernel is not guaranteed to
+	  run on anything other than the exact CPU selected.
+
+	  Disable this if you want to run the kernel on a specific CPU
+	  *only* and want maximum optimizations for that CPU.
 endif
 
 config X86_CPU
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/