lkml.org 
[lkml]   [2012]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 03/12] x86/common.c: Make have_cpuid_p() a global function
    Date
    From: Fenghua Yu <fenghua.yu@intel.com>

    Remove static declaration in have_cpuid_p() to make it a global function. The
    function will be called in early loading microcode.

    Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
    ---
    arch/x86/include/asm/processor.h | 8 ++++++++
    arch/x86/kernel/cpu/common.c | 9 +++------
    2 files changed, 11 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
    index 888184b..3d722fd 100644
    --- a/arch/x86/include/asm/processor.h
    +++ b/arch/x86/include/asm/processor.h
    @@ -190,6 +190,14 @@ extern void init_amd_cacheinfo(struct cpuinfo_x86 *c);
    extern void detect_extended_topology(struct cpuinfo_x86 *c);
    extern void detect_ht(struct cpuinfo_x86 *c);

    +#ifdef CONFIG_X86_32
    +extern int have_cpuid_p(void);
    +#else
    +static inline int have_cpuid_p(void)
    +{
    + return 1;
    +}
    +#endif
    static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
    unsigned int *ecx, unsigned int *edx)
    {
    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index 9c3ab43..d7fd246 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -37,6 +37,8 @@
    #include <asm/mce.h>
    #include <asm/msr.h>
    #include <asm/pat.h>
    +#include <asm/microcode.h>
    +#include <asm/microcode_intel.h>

    #ifdef CONFIG_X86_LOCAL_APIC
    #include <asm/uv/uv.h>
    @@ -213,7 +215,7 @@ static inline int flag_is_changeable_p(u32 flag)
    }

    /* Probe for the CPUID instruction */
    -static int __cpuinit have_cpuid_p(void)
    +int __cpuinit have_cpuid_p(void)
    {
    return flag_is_changeable_p(X86_EFLAGS_ID);
    }
    @@ -249,11 +251,6 @@ static inline int flag_is_changeable_p(u32 flag)
    {
    return 1;
    }
    -/* Probe for the CPUID instruction */
    -static inline int have_cpuid_p(void)
    -{
    - return 1;
    -}
    static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
    {
    }
    --
    1.8.0.1


    \
     
     \ /
      Last update: 2012-12-21 16:01    [W:4.335 / U:0.616 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site