projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] spidernet: fix Kconfig after BPA->CELL rename
[powerpc.git]
/
crypto
/
internal.h
diff --git
a/crypto/internal.h
b/crypto/internal.h
index
37515be
..
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();
}