projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3ef742
)
crypto/armcap.c: fix typo in rdtsc subroutine.
author
Andy Polyakov
<appro@openssl.org>
Sun, 15 Sep 2013 20:07:49 +0000
(22:07 +0200)
committer
Andy Polyakov
<appro@openssl.org>
Sun, 15 Sep 2013 20:07:49 +0000
(22:07 +0200)
PR: 3125
Submitted by: Kyle McMartin
crypto/armcap.c
patch
|
blob
|
history
diff --git
a/crypto/armcap.c
b/crypto/armcap.c
index 5258d2fbddfa36be538f869a6fc9cd6c8f9209c7..9abaf396e53e4f5f02a05639d66ccdd9cc023495 100644
(file)
--- 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;