Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

1 files changed, 1 insertions, 1 deletions

diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 11b981492031..8cc1622b2ee0 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -326,12 +326,12 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc,
         if (WARN_ON_ONCE(in_irq()))
                 return -EDEADLK;
 
+        walk->iv = desc->info;
         walk->nbytes = walk->total;
         if (unlikely(!walk->total))
                 return 0;
 
         walk->buffer = NULL;
-        walk->iv = desc->info;
         if (unlikely(((unsigned long)walk->iv & walk->alignmask))) {
                 int err = blkcipher_copy_iv(walk);
                 if (err)