aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-05-19 20:21:48 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-05-19 20:21:48 -0400
commitc534bbe5634bcc84cab0665fe8961df2c220aeec (patch)
treef2eae06abf1153c17dfd996f96dfe8a35851e9dc
parent965b5608f7da181923d766b83ead06cbdc7dd4b3 (diff)
parent8050936caf125fbe54111ba5e696b68a360556ba (diff)
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
-rw-r--r--arch/powerpc/kernel/time.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 122a580f7322..7e711bdcc6da 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -813,9 +813,6 @@ static void __init clocksource_init(void)
813static int decrementer_set_next_event(unsigned long evt, 813static int decrementer_set_next_event(unsigned long evt,
814 struct clock_event_device *dev) 814 struct clock_event_device *dev)
815{ 815{
816 /* Don't adjust the decrementer if some irq work is pending */
817 if (test_irq_work_pending())
818 return 0;
819 __get_cpu_var(decrementers_next_tb) = get_tb_or_rtc() + evt; 816 __get_cpu_var(decrementers_next_tb) = get_tb_or_rtc() + evt;
820 set_dec(evt); 817 set_dec(evt);
821 818