lkml.org 
[lkml]   [2008]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] x86: fix missing cpu_index initialisation
    From
    Date
    >From f49bbb826d8ec87609a63fb014af6aacb16aac38 Mon Sep 17 00:00:00 2001
    From: James Bottomley <James.Bottomley@HansenPartnership.com>
    Date: Wed, 29 Oct 2008 15:13:09 -0500
    Subject: [VOYAGER] x86: fix missing cpu_index initialisation

    Ever since

    commit 92cb7612aee39642d109b8d935ad265e602c0563
    Author: Mike Travis <travis@sgi.com>
    Date: Fri Oct 19 20:35:04 2007 +0200

    x86: convert cpuinfo_x86 array to a per_cpu array

    We've had an extra field in cpuinfo_x86 which is cpu_index.
    Unfortunately, voyager has never initialised this, although the only
    noticeable impact seems to be that /proc/cpuinfo shows all zeros for
    the processor ids.

    Anyway, fix this by initialising the boot CPU properly and setting the
    index when the secondaries update.

    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    ---

    Depends on [VOYAGER] x86: add ability to test for boot CPU

    arch/x86/kernel/cpu/common.c | 2 ++
    arch/x86/mach-voyager/voyager_smp.c | 1 +
    2 files changed, 3 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index 93e9393..da8f15a 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -549,6 +549,8 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
    this_cpu->c_early_init(c);

    validate_pat_support(c);
    +
    + c->cpu_index = boot_cpu_id;
    }

    void __init early_cpu_init(void)
    diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
    index 63ed72b..761d491 100644
    --- a/arch/x86/mach-voyager/voyager_smp.c
    +++ b/arch/x86/mach-voyager/voyager_smp.c
    @@ -415,6 +415,7 @@ void __init smp_store_cpu_info(int id)
    struct cpuinfo_x86 *c = &cpu_data(id);

    *c = boot_cpu_data;
    + c->cpu_index = id;

    identify_secondary_cpu(c);
    }
    --
    1.5.6.5




    \
     
     \ /
      Last update: 2008-10-30 22:15    [W:0.023 / U:34.156 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site