From 4230049b17626805697ac0506f0fc38745b30bd1 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Tue, 8 May 2012 16:31:12 -0700 Subject: [PATCH] --- yaml --- r: 303145 b: refs/heads/master c: 28ee793e7ad4a00e41c6267075501694c94451fb h: refs/heads/master i: 303143: 12b25edb04d34a2c9bf8f93388332e69b54e7f7e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/dsp.c | 5 +++-- trunk/arch/arm/plat-omap/devices.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 198d7ad79e1c..f1c8ed4aea4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ee47b0ae83e3cae2f9362113b3935898fdb3ea9 +refs/heads/master: 28ee793e7ad4a00e41c6267075501694c94451fb diff --git a/trunk/arch/arm/mach-omap2/dsp.c b/trunk/arch/arm/mach-omap2/dsp.c index 74f18f2952df..3376388b317a 100644 --- a/trunk/arch/arm/mach-omap2/dsp.c +++ b/trunk/arch/arm/mach-omap2/dsp.c @@ -57,8 +57,9 @@ static int __init omap_dsp_init(void) if (pdata->phys_mempool_base) { pdata->phys_mempool_size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE; - pr_info("%s: %x bytes @ %x\n", __func__, - pdata->phys_mempool_size, pdata->phys_mempool_base); + pr_info("%s: %llx bytes @ %llx\n", __func__, + (unsigned long long)pdata->phys_mempool_size, + (unsigned long long)pdata->phys_mempool_base); } pdev = platform_device_alloc("omap-dsp", -1); diff --git a/trunk/arch/arm/plat-omap/devices.c b/trunk/arch/arm/plat-omap/devices.c index 60278f47c0bd..09b07d252892 100644 --- a/trunk/arch/arm/plat-omap/devices.c +++ b/trunk/arch/arm/plat-omap/devices.c @@ -167,8 +167,8 @@ void __init omap_dsp_reserve_sdram_memblock(void) paddr = arm_memblock_steal(size, SZ_1M); if (!paddr) { - pr_err("%s: failed to reserve %x bytes\n", - __func__, size); + pr_err("%s: failed to reserve %llx bytes\n", + __func__, (unsigned long long)size); return; }