lkml.org 
[lkml]   [2008]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/16] x86: cpu common merge default_init
    Date
    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
    ---
    arch/x86/kernel/cpu/common.c | 4 ++++
    arch/x86/kernel/cpu/common_64.c | 12 ++++++++++++
    2 files changed, 16 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index 43d5287..2c4bfa2 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -224,6 +224,9 @@ static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};

    static void __cpuinit default_init(struct cpuinfo_x86 *c)
    {
    +#ifdef CONFIG_X86_64
    + display_cacheinfo(c);
    +#else
    /* Not much we can do here... */
    /* Check if at least it has cpuid */
    if (c->cpuid_level == -1) {
    @@ -233,6 +236,7 @@ static void __cpuinit default_init(struct cpuinfo_x86 *c)
    else if (c->x86 == 3)
    strcpy(c->x86_model_id, "386");
    }
    +#endif
    }

    static struct cpu_dev __cpuinitdata default_cpu = {
    diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c
    index d7b9965..2fda109 100644
    --- a/arch/x86/kernel/cpu/common_64.c
    +++ b/arch/x86/kernel/cpu/common_64.c
    @@ -223,7 +223,19 @@ static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};

    static void __cpuinit default_init(struct cpuinfo_x86 *c)
    {
    +#ifdef CONFIG_X86_64
    display_cacheinfo(c);
    +#else
    + /* Not much we can do here... */
    + /* Check if at least it has cpuid */
    + if (c->cpuid_level == -1) {
    + /* No cpuid. It must be an ancient CPU */
    + if (c->x86 == 4)
    + strcpy(c->x86_model_id, "486");
    + else if (c->x86 == 3)
    + strcpy(c->x86_model_id, "386");
    + }
    +#endif
    }

    static struct cpu_dev __cpuinitdata default_cpu = {
    --
    1.5.4.5


    \
     
     \ /
      Last update: 2008-09-05 05:15    [W:0.023 / U:119.708 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site