lkml.org 
[lkml]   [2011]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[043/152] SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

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


    From: Daniel Hellstrom <daniel@gaisler.com>

    [ Upstream commit b690c425fe07c725e7f1f7d40303588416cba67f ]

    Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    arch/sparc/kernel/leon_kernel.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/sparc/kernel/leon_kernel.c
    +++ b/arch/sparc/kernel/leon_kernel.c
    @@ -114,7 +114,7 @@ void __init leon_init_timers(irq_handler
    if (leon3_gptimer_regs && leon3_irqctrl_regs) {
    LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0);
    LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,
    - (((1000000 / 100) - 1)));
    + (((1000000 / HZ) - 1)));
    LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);

    #ifdef CONFIG_SMP
    @@ -128,7 +128,7 @@ void __init leon_init_timers(irq_handler
    }

    LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].val, 0);
    - LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/100) - 1)));
    + LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/HZ) - 1)));
    LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0);
    # endif




    \
     
     \ /
      Last update: 2011-01-06 01:57    [W:0.020 / U:1.960 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site