diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:11:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:11:50 -0400 |
| commit | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (patch) | |
| tree | f7c5c5e964c220de30fcdcd06b0f1efdb3e22439 /security | |
| parent | 3863e72414fa2ebf5f3b615d1bf99de32e59980a (diff) | |
| parent | d70063c4634af060a5387337b7632f6334ca3458 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'security')
| -rw-r--r-- | security/seclvl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/seclvl.c b/security/seclvl.c index c8e87b22c9bd..96b1f2122f67 100644 --- a/security/seclvl.c +++ b/security/seclvl.c | |||
| @@ -321,7 +321,7 @@ plaintext_to_sha1(unsigned char *hash, const char *plaintext, int len) | |||
| 321 | "bytes.\n", len, PAGE_SIZE); | 321 | "bytes.\n", len, PAGE_SIZE); |
| 322 | return -ENOMEM; | 322 | return -ENOMEM; |
| 323 | } | 323 | } |
| 324 | tfm = crypto_alloc_tfm("sha1", 0); | 324 | tfm = crypto_alloc_tfm("sha1", CRYPTO_TFM_REQ_MAY_SLEEP); |
| 325 | if (tfm == NULL) { | 325 | if (tfm == NULL) { |
| 326 | seclvl_printk(0, KERN_ERR, | 326 | seclvl_printk(0, KERN_ERR, |
| 327 | "Failed to load transform for SHA1\n"); | 327 | "Failed to load transform for SHA1\n"); |