diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /crypto | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
Merge with master.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 | ||