projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] ieee80211: Updated atmel to be compatible with ieee80211_hdr changes
[powerpc.git]
/
crypto
/
internal.h
diff --git
a/crypto/internal.h
b/crypto/internal.h
index
6861287
..
37aa652
100644
(file)
--- a/
crypto/internal.h
+++ b/
crypto/internal.h
@@
-17,6
+17,7
@@
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <asm/kmap_types.h>
extern enum km_type crypto_km_types[];
#include <asm/kmap_types.h>
extern enum km_type crypto_km_types[];
@@
-38,7
+39,7
@@
static inline void crypto_kunmap(void *vaddr, int out)
static inline void crypto_yield(struct crypto_tfm *tfm)
{
static inline void crypto_yield(struct crypto_tfm *tfm)
{
- if (
!in_atomic()
)
+ if (
tfm->crt_flags & CRYPTO_TFM_REQ_MAY_SLEEP
)
cond_resched();
}
cond_resched();
}
@@
-75,7
+76,7
@@
static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg,
switch (flags & CRYPTO_TFM_MODE_MASK) {
case CRYPTO_TFM_MODE_CBC:
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;
}
len += alg->cra_blocksize;
break;
}