diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-18 11:07:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-18 11:07:18 -0800 |
| commit | f3e7c92bf30810f5e70e15a75eff75e6892946cd (patch) | |
| tree | 054a910892515d5d54e5ec2219fdad4956cd79de | |
| parent | e8167ec9e0001a46679553048a9d08608026ce51 (diff) | |
| parent | b4739a921fdcd8e09b41c3fede1040869a956921 (diff) | |
| download | linux-crypto-f3e7c92bf30810f5e70e15a75eff75e6892946cd.tar.gz linux-crypto-f3e7c92bf30810f5e70e15a75eff75e6892946cd.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"A Kconfig dependency issue with omap-sham and a divide by zero in xor
on some platforms"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: omap-sham - Fix link error without crypto-engine
crypto: xor - Fix divide error in do_xor_speed()
| -rw-r--r-- | crypto/xor.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/xor.c b/crypto/xor.c index eacbf4f9..8f899f89 100644 --- a/crypto/xor.c +++ b/crypto/xor.c @@ -107,6 +107,8 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2) preempt_enable(); // bytes/ns == GB/s, multiply by 1000 to get MB/s [not MiB/s] + if (!min) + min = 1; speed = (1000 * REPS * BENCH_SIZE) / (unsigned int)ktime_to_ns(min); tmpl->speed = speed; |