diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 17:49:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 17:49:19 -0700 |
| commit | 3bee9df0ab55add6f8df92267a8a3d9d339cce08 (patch) | |
| tree | 0957c90aaba3918b820d26f27ea6c2a710ed08e5 /arch/ia64/kernel/time.c | |
| parent | 73ed9a86cd77b6a3b46beec8d353ac3b0d4f50c1 (diff) | |
| parent | 9b3377f9921766b6193861d0e3194854b1d765fe (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Count resched interrupts
[IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices
[IA64] update sn2_defconfig
[IA64] reformat pal.S to fit in 80 columns, fix typos
[IA64] remove unused PAL_CALL_IC_OFF
[IA64] - Allow IPIs in timer loop
[IA64] move ioremap/ioremap_nocache under __KERNEL__
[IA64] perfmon fix for global IRQ fix
Diffstat (limited to 'arch/ia64/kernel/time.c')
| -rw-r--r-- | arch/ia64/kernel/time.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 41169a9bc301..39e0cd3a0884 100644 --- a/arch/ia64/kernel/time.c +++ b/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 { |