Commit fd3958ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 19c329f6 38281194

crypto/xor.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ if CRYPTO_DEV_OMAP 
config CRYPTO_DEV_OMAP_SHAM

	tristate "Support for OMAP MD5/SHA1/SHA2 hw accelerator"

	depends on ARCH_OMAP2PLUS

	select CRYPTO_ENGINE

	select CRYPTO_SHA1

	select CRYPTO_MD5

	select CRYPTO_SHA256