diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-31 17:32:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-31 17:32:44 -0400 |
| commit | af6f5e3247a68074e384ef93c0b4bce1b73c9d80 (patch) | |
| tree | 87b0f1e48bd0ca67a78fab0fa42b37864863fdfd /crypto | |
| parent | 7e2987503dda95a5f80290bb8c06279009c2419e (diff) | |
| parent | 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index e68e43886d..964b9a60ca 100644 --- a/crypto/internal.h +++ b/crypto/internal.h | |||
| @@ -38,7 +38,7 @@ static inline void crypto_kunmap(void *vaddr, int out) | |||
| 38 | 38 | ||
| 39 | static inline void crypto_yield(struct crypto_tfm *tfm) | 39 | static inline void crypto_yield(struct crypto_tfm *tfm) |
| 40 | { | 40 | { |
| 41 | if (!in_softirq()) | 41 | if (!in_atomic()) |
| 42 | cond_resched(); | 42 | cond_resched(); |
| 43 | } | 43 | } |
| 44 | 44 | ||