lkml.org 
[lkml]   [2014]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 54/66] cpufreq: ppc-corenet-cpu-freq: do_div use quotient
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ed Swarthout <Ed.Swarthout@freescale.com>

    commit 906fe033145aab7d65a428bfda2cf19c75720894 upstream.

    Commit 6712d2931933 (cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost
    error) used the remainder from do_div instead of the quotient. Fix that
    and add one to ensure minimum is met.

    Fixes: 6712d2931933 (cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost error)
    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/cpufreq/ppc-corenet-cpufreq.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/drivers/cpufreq/ppc-corenet-cpufreq.c
    +++ b/drivers/cpufreq/ppc-corenet-cpufreq.c
    @@ -138,7 +138,7 @@ static int corenet_cpufreq_cpu_init(stru
    struct cpufreq_frequency_table *table;
    struct cpu_data *data;
    unsigned int cpu = policy->cpu;
    - u64 transition_latency_hz;
    + u64 u64temp;

    np = of_get_cpu_node(cpu, NULL);
    if (!np)
    @@ -206,9 +206,10 @@ static int corenet_cpufreq_cpu_init(stru
    for_each_cpu(i, per_cpu(cpu_mask, cpu))
    per_cpu(cpu_data, i) = data;

    - transition_latency_hz = 12ULL * NSEC_PER_SEC;
    - policy->cpuinfo.transition_latency =
    - do_div(transition_latency_hz, fsl_get_sys_freq());
    + /* Minimum transition latency is 12 platform clocks */
    + u64temp = 12ULL * NSEC_PER_SEC;
    + do_div(u64temp, fsl_get_sys_freq());
    + policy->cpuinfo.transition_latency = u64temp + 1;

    of_node_put(np);




    \
     
     \ /
      Last update: 2014-07-05 02:01    [W:2.576 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site