[tip:x86/cpu] x86/Kconfig/cpus: Fix/complete CPU type help texts

2015-10-21 Thread tip-bot for Borislav Petkov 
Commit-ID:  221836e92cd5664de6fc2f1d836f6343ae5f2e43
Gitweb: http://git.kernel.org/tip/221836e92cd5664de6fc2f1d836f6343ae5f2e43
Author: Borislav Petkov 
AuthorDate: Mon, 19 Oct 2015 10:41:17 +0200
Committer:  Ingo Molnar 
CommitDate: Wed, 21 Oct 2015 11:12:56 +0200

x86/Kconfig/cpus: Fix/complete CPU type help texts

Move the generic help text explaining each CPU type and what to
select under the "Processor Family" prompt and not under the
M486 option. Also, amend it with the missing options.

Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Denys Vlasenko 
Cc: H. Peter Anvin 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: http://lkml.kernel.org/r/1445244077-25120-1-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar 
---
 arch/x86/Kconfig.cpu | 24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 6983314..3ba5ff2 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -3,10 +3,6 @@ choice
prompt "Processor family"
default M686 if X86_32
default GENERIC_CPU if X86_64
-
-config M486
-   bool "486"
-   depends on X86_32
---help---
  This is the processor type of your CPU. This information is
  used for optimizing purposes. In order to compile a kernel
@@ -23,9 +19,9 @@ config M486
 
  Here are the settings recommended for greatest speed:
  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
- SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
+   SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
  - "586" for generic Pentium CPUs lacking the TSC
- (time stamp counter) register.
+   (time stamp counter) register.
  - "Pentium-Classic" for the Intel Pentium.
  - "Pentium-MMX" for the Intel Pentium MMX.
  - "Pentium-Pro" for the Intel Pentium Pro.
@@ -34,17 +30,31 @@ config M486
  - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
+ - "Opteron/Athlon64/Hammer/K8" for all K8 and newer AMD CPUs.
  - "Crusoe" for the Transmeta Crusoe series.
  - "Efficeon" for the Transmeta Efficeon series.
  - "Winchip-C6" for original IDT Winchip.
  - "Winchip-2" for IDT Winchips with 3dNow! capabilities.
+ - "AMD Elan" for the 32-bit AMD Elan embedded CPU.
  - "GeodeGX1" for Geode GX1 (Cyrix MediaGX).
  - "Geode GX/LX" For AMD Geode GX and LX processors.
  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
  - "VIA C3-2" for VIA C3-2 "Nehemiah" (model 9 and above).
  - "VIA C7" for VIA C7.
+ - "Intel P4" for the Pentium 4/Netburst microarchitecture.
+ - "Core 2/newer Xeon" for all core2 and newer Intel CPUs.
+ - "Intel Atom" for the Atom-microarchitecture CPUs.
+ - "Generic-x86-64" for a kernel which runs on any x86-64 CPU.
+
+ See each option's help text for additional details. If you don't know
+ what to do, choose "486".
 
- If you don't know what to do, choose "486".
+config M486
+   bool "486"
+   depends on X86_32
+   ---help---
+ Select this for an 486-class CPU such as AMD/Cyrix/IBM/Intel
+ 486DX/DX2/DX4 or SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
 
 config M586
bool "586/K5/5x86/6x86/6x86MX"
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:x86/cpu] x86/Kconfig/cpus: Fix/complete CPU type help texts

2015-10-21 Thread tip-bot for Borislav Petkov 
Commit-ID:  221836e92cd5664de6fc2f1d836f6343ae5f2e43
Gitweb: http://git.kernel.org/tip/221836e92cd5664de6fc2f1d836f6343ae5f2e43
Author: Borislav Petkov 
AuthorDate: Mon, 19 Oct 2015 10:41:17 +0200
Committer:  Ingo Molnar 
CommitDate: Wed, 21 Oct 2015 11:12:56 +0200

x86/Kconfig/cpus: Fix/complete CPU type help texts

Move the generic help text explaining each CPU type and what to
select under the "Processor Family" prompt and not under the
M486 option. Also, amend it with the missing options.

Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Denys Vlasenko 
Cc: H. Peter Anvin 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: http://lkml.kernel.org/r/1445244077-25120-1-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar 
---
 arch/x86/Kconfig.cpu | 24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 6983314..3ba5ff2 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -3,10 +3,6 @@ choice
prompt "Processor family"
default M686 if X86_32
default GENERIC_CPU if X86_64
-
-config M486
-   bool "486"
-   depends on X86_32
---help---
  This is the processor type of your CPU. This information is
  used for optimizing purposes. In order to compile a kernel
@@ -23,9 +19,9 @@ config M486
 
  Here are the settings recommended for greatest speed:
  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
- SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
+   SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
  - "586" for generic Pentium CPUs lacking the TSC
- (time stamp counter) register.
+   (time stamp counter) register.
  - "Pentium-Classic" for the Intel Pentium.
  - "Pentium-MMX" for the Intel Pentium MMX.
  - "Pentium-Pro" for the Intel Pentium Pro.
@@ -34,17 +30,31 @@ config M486
  - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
+ - "Opteron/Athlon64/Hammer/K8" for all K8 and newer AMD CPUs.
  - "Crusoe" for the Transmeta Crusoe series.
  - "Efficeon" for the Transmeta Efficeon series.
  - "Winchip-C6" for original IDT Winchip.
  - "Winchip-2" for IDT Winchips with 3dNow! capabilities.
+ - "AMD Elan" for the 32-bit AMD Elan embedded CPU.
  - "GeodeGX1" for Geode GX1 (Cyrix MediaGX).
  - "Geode GX/LX" For AMD Geode GX and LX processors.
  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
  - "VIA C3-2" for VIA C3-2 "Nehemiah" (model 9 and above).
  - "VIA C7" for VIA C7.
+ - "Intel P4" for the Pentium 4/Netburst microarchitecture.
+ - "Core 2/newer Xeon" for all core2 and newer Intel CPUs.
+ - "Intel Atom" for the Atom-microarchitecture CPUs.
+ - "Generic-x86-64" for a kernel which runs on any x86-64 CPU.
+
+ See each option's help text for additional details. If you don't know
+ what to do, choose "486".
 
- If you don't know what to do, choose "486".
+config M486
+   bool "486"
+   depends on X86_32
+   ---help---
+ Select this for an 486-class CPU such as AMD/Cyrix/IBM/Intel
+ 486DX/DX2/DX4 or SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
 
 config M586
bool "586/K5/5x86/6x86/6x86MX"
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/