From 1b3255dbb6bd1229830250a2618bc22f41ee4bbe Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 3 May 2012 15:45:03 +1000 Subject: [PATCH] --- yaml --- r: 304732 b: refs/heads/master c: d109a674a3685d43f16da5cc4cb8b927d07c436d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/ramoops.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 640a58085841..01abdcd2aca4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ba80d99c86f1b76df891afdf39b44df38bbd35b +refs/heads/master: d109a674a3685d43f16da5cc4cb8b927d07c436d diff --git a/trunk/drivers/char/ramoops.c b/trunk/drivers/char/ramoops.c index a6796c0610d2..b8b8542a5105 100644 --- a/trunk/drivers/char/ramoops.c +++ b/trunk/drivers/char/ramoops.c @@ -243,7 +243,7 @@ static int __init ramoops_probe(struct platform_device *pdev) if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) { pr_err("request mem region (0x%lx@0x%llx) failed\n", - cxt->size, cxt->phys_addr); + cxt->size, (unsigned long long)cxt->phys_addr); err = -EINVAL; goto fail_buf; } @@ -270,7 +270,8 @@ static int __init ramoops_probe(struct platform_device *pdev) dump_oops = pdata->dump_oops; pr_info("attached 0x%lx@0x%llx (%ux0x%zx)\n", - cxt->size, cxt->phys_addr, cxt->max_count, cxt->record_size); + cxt->size, (unsigned long long)cxt->phys_addr, + cxt->max_count, cxt->record_size); return 0;