diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-31 16:48:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-31 16:48:05 -0700 |
| commit | ba8f5baba79da8eb502f8534c3a8ecb64aceb790 (patch) | |
| tree | 39a0438607446681bdf5173c7480ff90f3825945 /arch/mips/au1000/common/time.c | |
| parent | 5cedae9ca752a43cfb1074907d12c9f01fbebd45 (diff) | |
| parent | 44d921b246923380f26b8010e47ac5dfe48fcec5 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Treat R14000 like R10000.
[MIPS] Remove EXPERIMENTAL from PAGE_SIZE_16KB
[MIPS] Update/Fix instruction definitions
[MIPS] DSP and MDMX share the same config flag bit.
[MIPS] Fix deadlock on MP with cache aliases.
[MIPS] Use generic STABS_DEBUG macro.
[MIPS] Create consistency in "system type" selection.
[MIPS] Use generic DWARF_DEBUG
[MIPS] Fix kgdb exception handler from user mode.
[MIPS] Update struct sigcontext member names
[MIPS] Update/fix futex assembly
[MIPS] Remove support for sysmips(2) SETNAME and MIPS_RDNVRAM operations.
[MIPS] Fix detection and handling of the 74K processor.
[MIPS] Add missing 34K processor IDs
[MIPS] Fix marking buddy of pte global for MIPS32 w/36-bit physical address
[MIPS] AU1xxx mips_timer_interrupt() fixes
[MIPS] Fix typo
Diffstat (limited to 'arch/mips/au1000/common/time.c')
| -rw-r--r-- | arch/mips/au1000/common/time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index f85f1524b36..f74d66a58a2 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c @@ -116,6 +116,7 @@ void mips_timer_interrupt(struct pt_regs *regs) null: ack_r4ktimer(0); + irq_exit(); } #ifdef CONFIG_PM |