lkml.org 
[lkml]   [2011]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[210/262] hwmon: (coretemp) Fix for non-SMP builds
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 2aba6cac2a84f3b80e11a680c34d55e7739b474d upstream.

    The definition of TO_ATTR_NO in the non-SMP case is wrong. As the SMP
    definition resolves to the correct value, just use this for both
    cases.

    Without this fix the temperature attributes are named temp0_* instead
    of temp2_*, so libsensors won't pick them. Broken since kernel 3.0.

    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Tested-by: Phil Sutter <phil@nwl.cc>
    Acked-by: Durgadoss R <Durgadoss.r@intel.com>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/hwmon/coretemp.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/drivers/hwmon/coretemp.c
    +++ b/drivers/hwmon/coretemp.c
    @@ -50,14 +50,13 @@
    #ifdef CONFIG_SMP
    #define TO_PHYS_ID(cpu) cpu_data(cpu).phys_proc_id
    #define TO_CORE_ID(cpu) cpu_data(cpu).cpu_core_id
    -#define TO_ATTR_NO(cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)
    #define for_each_sibling(i, cpu) for_each_cpu(i, cpu_sibling_mask(cpu))
    #else
    #define TO_PHYS_ID(cpu) (cpu)
    #define TO_CORE_ID(cpu) (cpu)
    -#define TO_ATTR_NO(cpu) (cpu)
    #define for_each_sibling(i, cpu) for (i = 0; false; )
    #endif
    +#define TO_ATTR_NO(cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)

    /*
    * Per-Core Temperature Data



    \
     
     \ /
      Last update: 2011-11-10 05:57    [W:2.443 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site