lkml.org 
[lkml]   [2013]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/cpu] x86: Fold-in trivial check_config function
    Commit-ID:  e277a49385743dfa69a7adbb1ff19732d83d258c
    Gitweb: http://git.kernel.org/tip/e277a49385743dfa69a7adbb1ff19732d83d258c
    Author: Borislav Petkov <bp@suse.de>
    AuthorDate: Mon, 8 Apr 2013 17:57:44 +0200
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Mon, 8 Apr 2013 09:07:17 -0700

    x86: Fold-in trivial check_config function

    Fold it into its single call site. No functionality change.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: http://lkml.kernel.org/r/1365436666-9837-3-git-send-email-bp@alien8.de
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    ---
    arch/x86/kernel/cpu/bugs.c | 27 +++++++++++----------------
    1 file changed, 11 insertions(+), 16 deletions(-)

    diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
    index efa24c0..0344534 100644
    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -63,21 +63,6 @@ static void __init check_fpu(void)
    }
    }

    -/*
    - * Check whether we are able to run this kernel safely on SMP.
    - *
    - * - i386 is no longer supported.
    - * - In order to run on anything without a TSC, we need to be
    - * compiled for a i486.
    - */
    -
    -static void __init check_config(void)
    -{
    - if (boot_cpu_data.x86 < 4)
    - panic("Kernel requires i486+ for 'invlpg' and other features");
    -}
    -
    -
    void __init check_bugs(void)
    {
    identify_boot_cpu();
    @@ -85,7 +70,17 @@ void __init check_bugs(void)
    pr_info("CPU: ");
    print_cpu_info(&boot_cpu_data);
    #endif
    - check_config();
    +
    + /*
    + * Check whether we are able to run this kernel safely on SMP.
    + *
    + * - i386 is no longer supported.
    + * - In order to run on anything without a TSC, we need to be
    + * compiled for a i486.
    + */
    + if (boot_cpu_data.x86 < 4)
    + panic("Kernel requires i486+ for 'invlpg' and other features");
    +
    init_utsname()->machine[1] =
    '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
    alternative_instructions();

    \
     
     \ /
      Last update: 2013-04-08 19:02    [W:2.536 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site