On Mon, Feb 01, 2010 at 09:03:10PM -0600, Shane McDonald wrote: > On Mon, Feb 1, 2010 at 3:10 AM, Wu Zhangjin <wuzhangjin@xxxxxxxxx> wrote: > > > > From: Wu Zhangjin <wuzhangjin@xxxxxxxxx> > > > > As reported by Maxime Bizon, the commit "MIPS: PowerTV: Fix support for > > timer interrupts with > 64 external IRQs" have broken the r4k timer > > since it didn't initialize the cp0_compare_irq_shift variable used in > > c0_compare_int_pending() on the architectures whose cpu_has_mips_r2 is > > false. > > > > This patch fixes it via initializing the cp0_compare_irq_shift as the > > cp0_compare_irq used in the old c0_compare_int_pending(). > > > > Reported-by: Maxime Bizon <mbizon@xxxxxxxxxx> > > Signed-off-by: Wu Zhangjin <wuzhangjin@xxxxxxxxx> > > When applied to 2.6.33-rc6, this patch fixes the problem on my > RM7035C-based system. > > Tested-by: Shane McDonald <mcdonald.shane@xxxxxxxxx> Thanks folks, applied. Ralf