On 03/09/2012 11:26 PM, Rob Lee wrote:
Hello Stephen, Yes, your resolution looks correct to me.
For me too. Thanks -- Daniel
On Fri, Mar 9, 2012 at 1:37 AM, Stephen Rothwell<sfr@xxxxxxxxxxxxxxxx> wrote:Hi Rob, Today's linux-next merge of the cpuidle-cons tree got a conflict in arch/arm/mach-at91/cpuidle.c between commit 00482a4078f4 ("ARM: at91: implement the standby function for pm/cpuidle") from the arm-soc tree and commit 7a1f6e72dce1 ("ARM: at91: Consolidate time keeping and irq enable") from the cpuidle-cons tree. I fixed it up (I think - see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/arm/mach-at91/cpuidle.c index 555d956,d40b3f3..0000000 --- a/arch/arm/mach-at91/cpuidle.c +++ b/arch/arm/mach-at91/cpuidle.c @@@ -37,23 -33,15 +33,8 @@@ static int at91_enter_idle(struct cpuid struct cpuidle_driver *drv, int index) { - struct timeval before, after; - int idle_time; - - local_irq_disable(); - do_gettimeofday(&before); - if (index == 0) - /* Wait for interrupt state */ - cpu_do_idle(); - else if (index == 1) - at91_standby(); - u32 saved_lpr; - - __asm__("b 1f; .align 5; 1:\n" - " mcr p15, 0, r0, c7, c10, 4"); /* drain write buffer */ - - saved_lpr = sdram_selfrefresh_enable(); - cpu_do_idle(); - sdram_selfrefresh_disable(saved_lpr); ++ at91_standby(); - do_gettimeofday(&after); - local_irq_enable(); - idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC + - (after.tv_usec - before.tv_usec); - - dev->last_residency = idle_time; return index; }
-- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
