lkml.org 
[lkml]   [2014]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 044/170] intel_pstate: Don't lose sysfs settings during cpu offline
    Date
    3.16.7-ckt1 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Dirk Brandewie <dirk.j.brandewie@intel.com>

    commit c034871712730a33e0267095f48b62eae958499c upstream.

    The user may have custom settings don't destroy them during suspend.

    Link: https://bugzilla.kernel.org/show_bug.cgi?id=80651
    Reported-by: Tobias Jakobi <liquid.acid@gmx.net>
    Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/cpufreq/intel_pstate.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
    index 41bbeae458a1..7e408bde89be 100644
    --- a/drivers/cpufreq/intel_pstate.c
    +++ b/drivers/cpufreq/intel_pstate.c
    @@ -726,7 +726,9 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
    {
    struct cpudata *cpu;

    - all_cpu_data[cpunum] = kzalloc(sizeof(struct cpudata), GFP_KERNEL);
    + if (!all_cpu_data[cpunum])
    + all_cpu_data[cpunum] = kzalloc(sizeof(struct cpudata),
    + GFP_KERNEL);
    if (!all_cpu_data[cpunum])
    return -ENOMEM;

    @@ -812,8 +814,6 @@ static void intel_pstate_stop_cpu(struct cpufreq_policy *policy)

    del_timer_sync(&all_cpu_data[cpu_num]->timer);
    intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
    - kfree(all_cpu_data[cpu_num]);
    - all_cpu_data[cpu_num] = NULL;
    }

    static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
    --
    2.1.0


    \
     
     \ /
      Last update: 2014-11-11 13:41    [W:4.109 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site