summaryrefslogtreecommitdiffstats
path: root/crypto/armcap.c
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2013-09-15 22:07:49 +0200
committerAndy Polyakov <appro@openssl.org>2013-09-15 22:07:49 +0200
commit8e52a9063a8a016bdac780005256994d26f9c2f9 (patch)
tree9e22e85b5d37a0ba861d9965bb499d0cd7fed012 /crypto/armcap.c
parentb3ef742cbbc1c8bf0e33dca60f08c65031647b07 (diff)
crypto/armcap.c: fix typo in rdtsc subroutine.
PR: 3125 Submitted by: Kyle McMartin
Diffstat (limited to 'crypto/armcap.c')
-rw-r--r--crypto/armcap.c2
1 files changed, 1 insertions, 1 deletions
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;