| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1450448302-27429-66-git-send-email-daniel.lezcano@linaro.org> Date: Fri, 18 Dec 2015 15:18:19 +0100 From: Daniel Lezcano <daniel.lezcano@...aro.org> To: tglx@...utronix.de Cc: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, mingo@...nel.org, Yoshinori Sato <ysato@...rs.sourceforge.jp>, uclinux-h8-devel@...ts.sourceforge.jp (moderated list:H8/300 ARCHITECTURE) Subject: [PATCH 66/69] clocksource/drivers/h8300: Fix timer not overflow case From: Yoshinori Sato <ysato@...rs.sourceforge.jp> Signed-off-by: Yoshinori Sato <ysato@...rs.sourceforge.jp> Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org> --- drivers/clocksource/h8300_timer16.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c index b14a8da..934ed0b 100644 --- a/drivers/clocksource/h8300_timer16.c +++ b/drivers/clocksource/h8300_timer16.c @@ -48,8 +48,10 @@ static unsigned long timer16_get_counter(struct timer16_priv *p) } while (unlikely((o1 != o2) || (v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) || (v3 > v1 && v3 < v2))); - v2 |= 0x10000; - return v2; + if (likely(!o1)) + return v2; + else + return v2 + 0x10000; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists