summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2016-08-05 13:31:29 +0000
committerkettenis <kettenis@openbsd.org>2016-08-05 13:31:29 +0000
commitdf7cbe9dd7aecd77f9abb71672dc084b8c6f22e0 (patch)
treefc44d50978dd6ed0b501d8e99b62ba285a0a1a87
parentenable dddd regression test (diff)
downloadwireguard-openbsd-df7cbe9dd7aecd77f9abb71672dc084b8c6f22e0.tar.xz
wireguard-openbsd-df7cbe9dd7aecd77f9abb71672dc084b8c6f22e0.zip
Unmask the timer output signal for real.
ok patrick@, jsg@
-rw-r--r--sys/arch/arm/cortex/agtimer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/arm/cortex/agtimer.c b/sys/arch/arm/cortex/agtimer.c
index 0b80250a423..38c8edaaefa 100644
--- a/sys/arch/arm/cortex/agtimer.c
+++ b/sys/arch/arm/cortex/agtimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agtimer.c,v 1.5 2015/12/12 19:57:00 mmcc Exp $ */
+/* $OpenBSD: agtimer.c,v 1.6 2016/08/05 13:31:29 kettenis Exp $ */
/*
* Copyright (c) 2011 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
@@ -315,7 +315,7 @@ agtimer_cpu_initclocks()
pc->pc_nexttickevent = pc->pc_nextstatevent = next;
reg = agtimer_get_ctrl();
- reg &= GTIMER_CNTP_CTL_IMASK;
+ reg &= ~GTIMER_CNTP_CTL_IMASK;
reg |= GTIMER_CNTP_CTL_ENABLE;
agtimer_set_tval(sc->sc_ticks_per_second);
agtimer_set_ctrl(reg);
@@ -391,7 +391,7 @@ agtimer_startclock(void)
pc->pc_nexttickevent = pc->pc_nextstatevent = nextevent;
reg = agtimer_get_ctrl();
- reg &= GTIMER_CNTP_CTL_IMASK;
+ reg &= ~GTIMER_CNTP_CTL_IMASK;
reg |= GTIMER_CNTP_CTL_ENABLE;
agtimer_set_tval(sc->sc_ticks_per_second);
agtimer_set_ctrl(reg);