diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-20 10:21:48 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-20 10:21:48 +1000 |
| commit | c534bbe5634bcc84cab0665fe8961df2c220aeec (patch) | |
| tree | f2eae06abf1153c17dfd996f96dfe8a35851e9dc /arch/powerpc/kernel | |
| parent | 965b5608f7da181923d766b83ead06cbdc7dd4b3 (diff) | |
| parent | 8050936caf125fbe54111ba5e696b68a360556ba (diff) | |
| download | linux-c534bbe5634bcc84cab0665fe8961df2c220aeec.tar.gz linux-c534bbe5634bcc84cab0665fe8961df2c220aeec.tar.bz2 linux-c534bbe5634bcc84cab0665fe8961df2c220aeec.zip | |
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
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 3 |
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) static int decrementer_set_next_event(unsigned long evt, 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; set_dec(evt); |