From c340c7a88c84bf7d02143f5705b4cc5726c48e25 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 15 Sep 2013 22:07:49 +0200 Subject: [PATCH] crypto/armcap.c: fix typo in rdtsc subroutine. PR: 3125 Submitted by: Kyle McMartin (cherry picked from commit 8e52a9063a8a016bdac780005256994d26f9c2f9) --- crypto/armcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/armcap.c b/crypto/armcap.c index 5258d2fbdd..9abaf396e5 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -23,7 +23,7 @@ unsigned int _armv7_tick(void); unsigned int OPENSSL_rdtsc(void) { - if (OPENSSL_armcap_P|ARMV7_TICK) + if (OPENSSL_armcap_P & ARMV7_TICK) return _armv7_tick(); else return 0; -- 2.25.1