diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
| commit | 2c92d787cc9fad57d05c96bd117782183768258a (patch) | |
| tree | 51c0c567b8be2fd56073a8ce31f8ebd123a7d562 /drivers/crypto/hisilicon/sgl.c | |
| parent | 145a773aef83181d47ebab21bb33c89233aadb1e (diff) | |
| parent | 8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49 (diff) | |
Merge branch 'linus' into x86/entry, to resolve conflictsx86_entry_for_5.8
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/crypto/hisilicon/sgl.c')
| -rw-r--r-- | drivers/crypto/hisilicon/sgl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/hisilicon/sgl.c b/drivers/crypto/hisilicon/sgl.c index 0e8c7e324fb4..725a739800b0 100644 --- a/drivers/crypto/hisilicon/sgl.c +++ b/drivers/crypto/hisilicon/sgl.c @@ -66,7 +66,8 @@ struct hisi_acc_sgl_pool *hisi_acc_create_sgl_pool(struct device *dev, sgl_size = sizeof(struct acc_hw_sge) * sge_nr + sizeof(struct hisi_acc_hw_sgl); - block_size = PAGE_SIZE * (1 << (MAX_ORDER - 1)); + block_size = 1 << (PAGE_SHIFT + MAX_ORDER <= 32 ? + PAGE_SHIFT + MAX_ORDER - 1 : 31); sgl_num_per_block = block_size / sgl_size; block_num = count / sgl_num_per_block; remain_sgl = count % sgl_num_per_block; |