Hi again, On Tue, 19 Oct 2010 15:48:49 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Today's linux-next merge of the tip tree got a conflict in > arch/powerpc/kernel/time.c between commit > cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using > timebase rather than PURR") from the powerpc tree and commit > e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq > context callbacks") from the tip tree. > > Just context changes. I fixed it up and can carry the fix as necessary. I forgot the merge diff, sorry: diff --cc arch/powerpc/kernel/time.c index 644f918,54888eb..0000000 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@@ -578,9 -585,11 +578,9 @@@ void timer_interrupt(struct pt_regs * r old_regs = set_irq_regs(regs); irq_enter(); - if (test_perf_event_pending()) { - clear_perf_event_pending(); - perf_event_do_pending(); - calculate_steal_time(); - + if (test_irq_work_pending()) { + clear_irq_work_pending(); + irq_work_run(); } #ifdef CONFIG_PPC_ISERIES -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx -- 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