diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 06:53:45 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 06:53:45 -0400 |
| commit | 1eecb8280b038019f2f914abc01b28caf5d0a168 (patch) | |
| tree | 7efa7cfc60b64ce50d437342d6457211effbb0ea /include/linux/cryptouser.h | |
| parent | c2f6702d318e43bf841da9c0ba5b6f1695661bbc (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge tag 'v3.4-rc2' into for-3.5
Linux 3.4-rc2 contains some bug fixes we need, including the addition of
an export for regcache_sync_region().
Diffstat (limited to 'include/linux/cryptouser.h')
| -rw-r--r-- | include/linux/cryptouser.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/cryptouser.h b/include/linux/cryptouser.h index 532fb58f16bf..4abf2ea6a887 100644 --- a/include/linux/cryptouser.h +++ b/include/linux/cryptouser.h | |||
| @@ -100,3 +100,6 @@ struct crypto_report_rng { | |||
| 100 | char type[CRYPTO_MAX_NAME]; | 100 | char type[CRYPTO_MAX_NAME]; |
| 101 | unsigned int seedsize; | 101 | unsigned int seedsize; |
| 102 | }; | 102 | }; |
| 103 | |||
| 104 | #define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ | ||
| 105 | sizeof(struct crypto_report_blkcipher)) | ||