diff options
| author | Tan Xiaojun <tanxiaojun@huawei.com> | 2015-09-24 05:27:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-05 05:49:54 +0200 |
| commit | a785ce9c90bc7d73b5cae4388641b310948509cb (patch) | |
| tree | ca3b9e2c8c4e37a4cea558c56a6312373117b06d | |
| parent | base/platform: assert that dev_pm_domain callbacks are called unconditionally (diff) | |
| download | linux-a785ce9c90bc7d73b5cae4388641b310948509cb.tar.xz linux-a785ce9c90bc7d73b5cae4388641b310948509cb.zip | |
CMA: fix CONFIG_CMA_SIZE_MBYTES overflow in 64bit
In 64bit system, if you set CONFIG_CMA_SIZE_MBYTES>=2048, it will
overflow and size_bytes will be a big wrong number.
Set CONFIG_CMA_SIZE_MBYTES=2048 and you will get an info below
during system boot:
*********
cma: Failed to reserve 17592186042368 MiB
*********
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/base/dma-contiguous.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 950fff9ce453..426ba2772fe6 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -46,7 +46,7 @@ struct cma *dma_contiguous_default_area; * Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes = CMA_SIZE_MBYTES * SZ_1M; +static const phys_addr_t size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; static phys_addr_t size_cmdline = -1; static phys_addr_t base_cmdline; static phys_addr_t limit_cmdline; |