diff options
| -rw-r--r-- | sys/arm/mv/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c index fb3b321..6d3de4e 100644 --- a/sys/arm/mv/timer.c +++ b/sys/arm/mv/timer.c @@ -150,6 +150,7 @@ mv_timer_attach(device_t dev) write_cpu_ctrl(BRIDGE_IRQ_CAUSE, irq_cause); irq_mask = read_cpu_ctrl(BRIDGE_IRQ_MASK); irq_mask |= IRQ_TIMER0_MASK; + irq_mask &= ~IRQ_TIMER1_MASK; write_cpu_ctrl(BRIDGE_IRQ_MASK, irq_mask); sc->et.et_name = "CPUTimer0"; @@ -229,7 +230,7 @@ DELAY(int usec) if (!timers_initialized) { for (; usec > 0; usec--) for (val = 100; val > 0; val--) - ; + __asm __volatile("nop" ::: "memory"); return; } |
