Commit c534bbe5 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt

Merge branch 'merge' into next

Merge "merge" branch to get two fairly important bug fixes:

powerpc/powernv: Reset root port in firmware
powerpc: irq work racing with timer interrupt can result in timer interrupt
parents 965b5608 8050936c
...@@ -813,9 +813,6 @@ static void __init clocksource_init(void) ...@@ -813,9 +813,6 @@ static void __init clocksource_init(void)
static int decrementer_set_next_event(unsigned long evt, static int decrementer_set_next_event(unsigned long evt,
struct clock_event_device *dev) struct clock_event_device *dev)
{ {
/* Don't adjust the decrementer if some irq work is pending */
if (test_irq_work_pending())
return 0;
__get_cpu_var(decrementers_next_tb) = get_tb_or_rtc() + evt; __get_cpu_var(decrementers_next_tb) = get_tb_or_rtc() + evt;
set_dec(evt); set_dec(evt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment