Commit c01914ef authored by Russell King (Oracle)'s avatar Russell King (Oracle)

ARM: use MiB for vmalloc sizes

Rather than using "m" (which is the unit of metres, or milli), and
"MB" in the printk statements, use MiB to make it clear that we are
talking about the power-of-2 megabytes, aka mebibytes.
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarYanfei Xu <yanfei.xu@windriver.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent 08b84240
...@@ -1126,7 +1126,7 @@ static unsigned long __initdata vmalloc_size = 240 * SZ_1M; ...@@ -1126,7 +1126,7 @@ static unsigned long __initdata vmalloc_size = 240 * SZ_1M;
/* /*
* vmalloc=size forces the vmalloc area to be exactly 'size' * vmalloc=size forces the vmalloc area to be exactly 'size'
* bytes. This can be used to increase (or decrease) the vmalloc * bytes. This can be used to increase (or decrease) the vmalloc
* area - the default is 240m. * area - the default is 240MiB.
*/ */
static int __init early_vmalloc(char *arg) static int __init early_vmalloc(char *arg)
{ {
...@@ -1135,14 +1135,14 @@ static int __init early_vmalloc(char *arg) ...@@ -1135,14 +1135,14 @@ static int __init early_vmalloc(char *arg)
if (vmalloc_reserve < SZ_16M) { if (vmalloc_reserve < SZ_16M) {
vmalloc_reserve = SZ_16M; vmalloc_reserve = SZ_16M;
pr_warn("vmalloc area too small, limiting to %luMB\n", pr_warn("vmalloc area is too small, limiting to %luMiB\n",
vmalloc_reserve >> 20); vmalloc_reserve >> 20);
} }
vmalloc_max = VMALLOC_END - (PAGE_OFFSET + SZ_32M + VMALLOC_OFFSET); vmalloc_max = VMALLOC_END - (PAGE_OFFSET + SZ_32M + VMALLOC_OFFSET);
if (vmalloc_reserve > vmalloc_max) { if (vmalloc_reserve > vmalloc_max) {
vmalloc_reserve = vmalloc_max; vmalloc_reserve = vmalloc_max;
pr_warn("vmalloc area is too big, limiting to %luMB\n", pr_warn("vmalloc area is too big, limiting to %luMiB\n",
vmalloc_reserve >> 20); vmalloc_reserve >> 20);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment