diff options
author | Borislav Petkov <borislav.petkov@amd.com> | 2012-08-01 13:17:01 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-08-22 19:15:16 -0400 |
commit | e43f6e67ec1c142550860bbe0b51166c5ee4cac8 (patch) | |
tree | e0b3d0785687adef47765608d596826c90ecc8c6 | |
parent | 09c3f0d883300c8fc2bb62e9a70cf89a2ada9a80 (diff) |
x86, microcode: Straighten out Kconfig text
Update and clarify Kconfig help text along with menu names.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Link: http://lkml.kernel.org/r/1344361461-10076-6-git-send-email-bp@amd64.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r-- | arch/x86/Kconfig | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8ec3a1aa4abd..1ccccc6efb37 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -982,25 +982,25 @@ config X86_REBOOTFIXUPS | |||
982 | Say N otherwise. | 982 | Say N otherwise. |
983 | 983 | ||
984 | config MICROCODE | 984 | config MICROCODE |
985 | tristate "/dev/cpu/microcode - microcode support" | 985 | tristate "CPU microcode loading support" |
986 | select FW_LOADER | 986 | select FW_LOADER |
987 | ---help--- | 987 | ---help--- |
988 | |||
988 | If you say Y here, you will be able to update the microcode on | 989 | If you say Y here, you will be able to update the microcode on |
989 | certain Intel and AMD processors. The Intel support is for the | 990 | certain Intel and AMD processors. The Intel support is for the |
990 | IA32 family, e.g. Pentium Pro, Pentium II, Pentium III, | 991 | IA32 family, e.g. Pentium Pro, Pentium II, Pentium III, Pentium 4, |
991 | Pentium 4, Xeon etc. The AMD support is for family 0x10 and | 992 | Xeon etc. The AMD support is for families 0x10 and later. You will |
992 | 0x11 processors, e.g. Opteron, Phenom and Turion 64 Ultra. | 993 | obviously need the actual microcode binary data itself which is not |
993 | You will obviously need the actual microcode binary data itself | 994 | shipped with the Linux kernel. |
994 | which is not shipped with the Linux kernel. | ||
995 | 995 | ||
996 | This option selects the general module only, you need to select | 996 | This option selects the general module only, you need to select |
997 | at least one vendor specific module as well. | 997 | at least one vendor specific module as well. |
998 | 998 | ||
999 | To compile this driver as a module, choose M here: the | 999 | To compile this driver as a module, choose M here: the module |
1000 | module will be called microcode. | 1000 | will be called microcode. |
1001 | 1001 | ||
1002 | config MICROCODE_INTEL | 1002 | config MICROCODE_INTEL |
1003 | bool "Intel microcode patch loading support" | 1003 | bool "Intel microcode loading support" |
1004 | depends on MICROCODE | 1004 | depends on MICROCODE |
1005 | default MICROCODE | 1005 | default MICROCODE |
1006 | select FW_LOADER | 1006 | select FW_LOADER |
@@ -1013,7 +1013,7 @@ config MICROCODE_INTEL | |||
1013 | <http://www.urbanmyth.org/microcode/>. | 1013 | <http://www.urbanmyth.org/microcode/>. |
1014 | 1014 | ||
1015 | config MICROCODE_AMD | 1015 | config MICROCODE_AMD |
1016 | bool "AMD microcode patch loading support" | 1016 | bool "AMD microcode loading support" |
1017 | depends on MICROCODE | 1017 | depends on MICROCODE |
1018 | select FW_LOADER | 1018 | select FW_LOADER |
1019 | ---help--- | 1019 | ---help--- |