lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[01/17] hwmon: (coretemp) Properly label the sensors
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Jean Delvare <khali@linux-fr.org>

    commit 3f4f09b4be35d38d6e2bf22c989443e65e70fc4c upstream.

    Don't assume that CPU entry number and core ID always match. It
    worked in the simple cases (single CPU, no HT) but fails on
    multi-CPU systems.

    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Huaxu Wan <huaxu.wan@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/hwmon/coretemp.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/hwmon/coretemp.c
    +++ b/drivers/hwmon/coretemp.c
    @@ -52,6 +52,7 @@ struct coretemp_data {
    struct mutex update_lock;
    const char *name;
    u32 id;
    + u16 core_id;
    char valid; /* zero until following fields are valid */
    unsigned long last_updated; /* in jiffies */
    int temp;
    @@ -74,7 +75,7 @@ static ssize_t show_name(struct device *
    if (attr->index == SHOW_NAME)
    ret = sprintf(buf, "%s\n", data->name);
    else /* show label */
    - ret = sprintf(buf, "Core %d\n", data->id);
    + ret = sprintf(buf, "Core %d\n", data->core_id);
    return ret;
    }

    @@ -216,6 +217,9 @@ static int __devinit coretemp_probe(stru
    }

    data->id = pdev->id;
    +#ifdef CONFIG_SMP
    + data->core_id = c->cpu_core_id;
    +#endif
    data->name = "coretemp";
    mutex_init(&data->update_lock);




    \
     
     \ /
      Last update: 2010-07-30 19:05    [W:0.021 / U:0.752 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site