diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 17:57:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 17:57:14 -0400 |
| commit | ab3fc403633c38aef5ef48844f8e5dbfee7c34f8 (patch) | |
| tree | 475459da3d3cc0071c71900cfbcdc389d3d71597 /crypto/internal.h | |
| parent | f10d20c1f192aa90fc935207f22da32462e793ee (diff) | |
| parent | d1faeaeb95a05275cf0c5b51b88f2fa833434625 (diff) | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
Diffstat (limited to 'crypto/internal.h')
| -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 e68e43886d3c..964b9a60ca24 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 | ||