diff options
| author | Andy Polyakov <appro@openssl.org> | 2013-09-15 22:07:49 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2013-09-15 22:11:34 +0200 |
| commit | 00c991f02850788ff36c09458f18927851424d60 (patch) | |
| tree | 1c70fc3dd9b0b63a9de65086011fb14d7ee2a3d2 /crypto/armcap.c | |
| parent | 55856a7b744748c3652ab71bfce6c47fccf9ce50 (diff) | |
crypto/armcap.c: fix typo in rdtsc subroutine.
PR: 3125
Submitted by: Kyle McMartin
(cherry picked from commit 8e52a9063a8a016bdac780005256994d26f9c2f9)
Diffstat (limited to 'crypto/armcap.c')
| -rw-r--r-- | crypto/armcap.c | 2 |
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; |