diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-11 14:56:38 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-11 14:56:38 (GMT) |
| commit | d2950158d0d7bc376503393ca5f73f6f8d27c56b (patch) | |
| tree | 7daa04400d833bd722258a49d56a39acfb392520 /crypto | |
| parent | ea7c28518943b26a85d73cd76acd03b71962cb18 (diff) | |
| parent | e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f (diff) | |
| download | linux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 1 | ||||
| -rw-r--r-- | crypto/ahash.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 93a1fdc..1d33beb 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -96,6 +96,7 @@ config CRYPTO_AKCIPHER config CRYPTO_RSA tristate "RSA algorithm" select CRYPTO_AKCIPHER + select CRYPTO_MANAGER select MPILIB select ASN1 help diff --git a/crypto/ahash.c b/crypto/ahash.c index 5fc1f17..3887a98 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -69,8 +69,9 @@ static int hash_walk_new_entry(struct crypto_hash_walk *walk) struct scatterlist *sg; sg = walk->sg; - walk->pg = sg_page(sg); walk->offset = sg->offset; + walk->pg = sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT); + walk->offset = offset_in_page(walk->offset); walk->entrylen = sg->length; if (walk->entrylen > walk->total) |