diff --git a/[refs] b/[refs] index 5521cd7611be..18e7a027cfbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffc45571dfb4b70e7eda8d97f64a05f5e5a992ac +refs/heads/master: accaddb27a2d544e38e10ff2a2782b33bbbad913 diff --git a/trunk/arch/ia64/kernel/time.c b/trunk/arch/ia64/kernel/time.c index 41169a9bc301..39e0cd3a0884 100644 --- a/trunk/arch/ia64/kernel/time.c +++ b/trunk/arch/ia64/kernel/time.c @@ -84,6 +84,12 @@ timer_interrupt (int irq, void *dev_id) if (time_after(new_itm, ia64_get_itc())) break; + + /* + * Allow IPIs to interrupt the timer loop. + */ + local_irq_enable(); + local_irq_disable(); } do {