aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorTan Xiaojun <tanxiaojun@huawei.com>2015-09-23 23:27:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-04 23:49:54 -0400
commita785ce9c90bc7d73b5cae4388641b310948509cb (patch)
treeca3b9e2c8c4e37a4cea558c56a6312373117b06d /drivers/base
parentb8b2c7d845d57f7a4b9f1f941f24728165e27626 (diff)
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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dma-contiguous.c2
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;
46 * Users, who want to set the size of global CMA area for their system 46 * Users, who want to set the size of global CMA area for their system
47 * should use cma= kernel parameter. 47 * should use cma= kernel parameter.
48 */ 48 */
49static const phys_addr_t size_bytes = CMA_SIZE_MBYTES * SZ_1M; 49static const phys_addr_t size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M;
50static phys_addr_t size_cmdline = -1; 50static phys_addr_t size_cmdline = -1;
51static phys_addr_t base_cmdline; 51static phys_addr_t base_cmdline;
52static phys_addr_t limit_cmdline; 52static phys_addr_t limit_cmdline;