summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-07-15 18:37:48 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2009-07-15 18:37:48 +0800
commitfaae890883624e14a328863eafabf54a36698774 (patch)
tree647d5c14ed5ced5e20792a591a79b0c7a207fdcb /drivers
parentb5ebd44eb7559ea6135d536bafd02323d2ef0547 (diff)
downloadop-kernel-dev-faae890883624e14a328863eafabf54a36698774.zip
op-kernel-dev-faae890883624e14a328863eafabf54a36698774.tar.gz
crypto: padlock - Fix compile error on i386
The previous change to allow hashing from states other than the initial broke compilation on i386 because the inline assembly tried to squeeze a u64 into a 32-bit register. As we've already checked for 32-bit overflows we can simply truncate it to u32, or unsigned long so that we don't truncate at all on x86-64. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/crypto/padlock-sha.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
index fb6e6c3..a936ba4 100644
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
@@ -103,7 +103,8 @@ static int padlock_sha1_finup(struct shash_desc *desc, const u8 *in,
ts_state = irq_ts_save();
asm volatile (".byte 0xf3,0x0f,0xa6,0xc8" /* rep xsha1 */
: \
- : "c"(state.count + count), "a"(state.count), \
+ : "c"((unsigned long)state.count + count), \
+ "a"((unsigned long)state.count), \
"S"(in), "D"(result));
irq_ts_restore(ts_state);
@@ -165,7 +166,8 @@ static int padlock_sha256_finup(struct shash_desc *desc, const u8 *in,
ts_state = irq_ts_save();
asm volatile (".byte 0xf3,0x0f,0xa6,0xd0" /* rep xsha256 */
: \
- : "c"(state.count + count), "a"(state.count), \
+ : "c"((unsigned long)state.count + count), \
+ "a"((unsigned long)state.count), \
"S"(in), "D"(result));
irq_ts_restore(ts_state);
OpenPOWER on IntegriCloud