From a9e92ac487ba9577194bb86beaa28c3823505a61 Mon Sep 17 00:00:00 2001 From: Maxime Bizon Date: Mon, 22 Oct 2012 11:19:28 +0200 Subject: [PATCH] --- yaml --- r: 344447 b: refs/heads/master c: b042e47491ba5f487601b5141a3f1d8582304170 h: refs/heads/master i: 344445: fb77ea1be04e4ca791a42c5a0739bc6d31a97544 344443: 2d263db836ccbd916f8a20bf8f65fdfef233d9a0 344439: 35ed4cd19330dd818f16409731d2083b39f1e9aa 344431: 5e30950675206556058084c399bd227c082ea004 344415: b9509cbae88f51f9fc2f6bfb3e51508af3085bb0 344383: 4dcb3c39f37b23f1a889fa858959d6d5569fad73 344319: 06c8c6dc825dae96231efd353ddee8797e0f579f v: v3 --- [refs] | 2 +- trunk/fs/pstore/ram.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cb5b86a4a749..0638d23530bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53f21a8ea1d76a002103ce20abd168fe83b20ee7 +refs/heads/master: b042e47491ba5f487601b5141a3f1d8582304170 diff --git a/trunk/fs/pstore/ram.c b/trunk/fs/pstore/ram.c index 2b6ebbca3521..8741cea6253c 100644 --- a/trunk/fs/pstore/ram.c +++ b/trunk/fs/pstore/ram.c @@ -376,10 +376,14 @@ static int __devinit ramoops_probe(struct platform_device *pdev) goto fail_out; } - pdata->mem_size = rounddown_pow_of_two(pdata->mem_size); - pdata->record_size = rounddown_pow_of_two(pdata->record_size); - pdata->console_size = rounddown_pow_of_two(pdata->console_size); - pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size); + if (!is_power_of_2(pdata->mem_size)) + pdata->mem_size = rounddown_pow_of_two(pdata->mem_size); + if (!is_power_of_2(pdata->record_size)) + pdata->record_size = rounddown_pow_of_two(pdata->record_size); + if (!is_power_of_2(pdata->console_size)) + pdata->console_size = rounddown_pow_of_two(pdata->console_size); + if (!is_power_of_2(pdata->ftrace_size)) + pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size); cxt->dump_read_cnt = 0; cxt->size = pdata->mem_size;