summaryrefslogtreecommitdiffstats
path: root/crypto/internal.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-07-30 14:37:43 +1000
committerDave Airlie <airlied@linux.ie>2005-07-30 14:37:43 +1000
commitbdf242eeb0f69567fe43eba93889d80ecacbfe94 (patch)
treedc402eeeb75fd51e92b4f4a63712c6e64ac4c2fb /crypto/internal.h
parent836cf0465c422ee6d654060edd7c620d9cf0c09c (diff)
parentb0825488a642cadcf39709961dde61440cb0731c (diff)
downloadkernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.gz
kernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.xz
kernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.zip
Merge ../linux-2.6/
Diffstat (limited to 'crypto/internal.h')
-rw-r--r--crypto/internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/internal.h b/crypto/internal.h
index 68612874b5f..37515beafc8 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -75,7 +75,7 @@ static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg,
switch (flags & CRYPTO_TFM_MODE_MASK) {
case CRYPTO_TFM_MODE_CBC:
- len = ALIGN(len, alg->cra_alignmask + 1);
+ len = ALIGN(len, (unsigned long)alg->cra_alignmask + 1);
len += alg->cra_blocksize;
break;
}