lkml.org 
[lkml]   [2007]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 6/10] thermal_throttle: fix cpu hotplug error handling
    Make thermal_throttle_add_dev() CPU_UP_PREPARE event handler
    instead of CPU_ONLINE event handler.

    Cc: Dmitriy Zavin <dmitriyz@google.com>
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>

    ---
    arch/i386/kernel/cpu/mcheck/therm_throt.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    Index: 2.6-mm/arch/i386/kernel/cpu/mcheck/therm_throt.c
    ===================================================================
    --- 2.6-mm.orig/arch/i386/kernel/cpu/mcheck/therm_throt.c
    +++ 2.6-mm/arch/i386/kernel/cpu/mcheck/therm_throt.c
    @@ -131,23 +131,24 @@ static __cpuinit int thermal_throttle_cp
    {
    unsigned int cpu = (unsigned long)hcpu;
    struct sys_device *sys_dev;
    - int err;
    + int err = 0;

    sys_dev = get_cpu_sysdev(cpu);
    mutex_lock(&therm_cpu_lock);
    switch (action) {
    - case CPU_ONLINE:
    - case CPU_ONLINE_FROZEN:
    + case CPU_UP_PREPARE:
    + case CPU_UP_PREPARE_FROZEN:
    err = thermal_throttle_add_dev(sys_dev);
    - WARN_ON(err);
    break;
    + case CPU_UP_CANCELED:
    + case CPU_UP_CANCELED_FROZEN:
    case CPU_DEAD:
    case CPU_DEAD_FROZEN:
    thermal_throttle_remove_dev(sys_dev);
    break;
    }
    mutex_unlock(&therm_cpu_lock);
    - return NOTIFY_OK;
    + return err ? NOTIFY_BAD : NOTIFY_OK;
    }

    static struct notifier_block thermal_throttle_cpu_notifier =
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-07-16 16:09    [W:0.047 / U:64.000 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site