diff --git a/[refs] b/[refs] index 6c60b4206466..bdcfcd6bc78b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a384f6411734e763daa4bae30e8ff170d7d4c3e2 +refs/heads/master: 0427193b691edc81c846c7d0ebd2561cae8709d8 diff --git a/trunk/fs/pstore/ram.c b/trunk/fs/pstore/ram.c index bcd1bbd42598..fba8c7256929 100644 --- a/trunk/fs/pstore/ram.c +++ b/trunk/fs/pstore/ram.c @@ -406,7 +406,7 @@ static int __devinit ramoops_probe(struct platform_device *pdev) goto fail_init_fprz; if (!cxt->przs && !cxt->cprz && !cxt->fprz) { - pr_err("memory size too small, minimum is %lu\n", + pr_err("memory size too small, minimum is %zu\n", cxt->console_size + cxt->record_size + cxt->ftrace_size); goto fail_cnt;