lkml.org 
[lkml]   [2012]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/microcode] x86, microcode: Straighten out Kconfig text
    Commit-ID:  e43f6e67ec1c142550860bbe0b51166c5ee4cac8
    Gitweb: http://git.kernel.org/tip/e43f6e67ec1c142550860bbe0b51166c5ee4cac8
    Author: Borislav Petkov <borislav.petkov@amd.com>
    AuthorDate: Wed, 1 Aug 2012 19:17:01 +0200
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Wed, 22 Aug 2012 16:15:16 -0700

    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>
    ---
    arch/x86/Kconfig | 20 ++++++++++----------
    1 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 8ec3a1a..1ccccc6 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -982,25 +982,25 @@ config X86_REBOOTFIXUPS
    Say N otherwise.

    config MICROCODE
    - tristate "/dev/cpu/microcode - microcode support"
    + tristate "CPU microcode loading support"
    select FW_LOADER
    ---help---
    +
    If you say Y here, you will be able to update the microcode on
    certain Intel and AMD processors. The Intel support is for the
    - IA32 family, e.g. Pentium Pro, Pentium II, Pentium III,
    - Pentium 4, Xeon etc. The AMD support is for family 0x10 and
    - 0x11 processors, e.g. Opteron, Phenom and Turion 64 Ultra.
    - You will obviously need the actual microcode binary data itself
    - which is not shipped with the Linux kernel.
    + IA32 family, e.g. Pentium Pro, Pentium II, Pentium III, Pentium 4,
    + Xeon etc. The AMD support is for families 0x10 and later. You will
    + obviously need the actual microcode binary data itself which is not
    + shipped with the Linux kernel.

    This option selects the general module only, you need to select
    at least one vendor specific module as well.

    - To compile this driver as a module, choose M here: the
    - module will be called microcode.
    + To compile this driver as a module, choose M here: the module
    + will be called microcode.

    config MICROCODE_INTEL
    - bool "Intel microcode patch loading support"
    + bool "Intel microcode loading support"
    depends on MICROCODE
    default MICROCODE
    select FW_LOADER
    @@ -1013,7 +1013,7 @@ config MICROCODE_INTEL
    <http://www.urbanmyth.org/microcode/>.

    config MICROCODE_AMD
    - bool "AMD microcode patch loading support"
    + bool "AMD microcode loading support"
    depends on MICROCODE
    select FW_LOADER
    ---help---

    \
     
     \ /
      Last update: 2012-08-23 02:21    [W:2.376 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site