diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 03:14:47 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 03:14:47 +0200 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /security/seclvl.c | |
| parent | Input: HIDDEV - make HIDIOCSREPORT wait IO completion (diff) | |
| parent | [PATCH] md: fix BUG when raid10 rebuilds without enough drives (diff) | |
| download | linux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz linux-d344c5e0856ad03278d8700b503762dbc8b86e12.zip | |
Manual merge with Linus
Diffstat (limited to 'security/seclvl.c')
| -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) "bytes.\n", len, PAGE_SIZE); return -ENOMEM; } - tfm = crypto_alloc_tfm("sha1", 0); + tfm = crypto_alloc_tfm("sha1", CRYPTO_TFM_REQ_MAY_SLEEP); if (tfm == NULL) { seclvl_printk(0, KERN_ERR, "Failed to load transform for SHA1\n"); |