openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: use a temporary variable to hold maximum vmalloc size 

We calculate the maximum size of the vmalloc space twice in
early_vmalloc(). Use a temporary variable to hold this value.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Yanfei Xu <yanfei.xu@windriver.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Russell King (Oracle) 2021-05-18 12:40:21 +01:00
parent 01bb34852b
commit 4f706b078f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mm/mmu.c
View File

@ -1132,6 +1132,7 @@ static unsigned long __initdata vmalloc_min =
static int __init early_vmalloc(char *arg) static int __init early_vmalloc(char *arg)
{ {
unsigned long vmalloc_reserve = memparse(arg, NULL); unsigned long vmalloc_reserve = memparse(arg, NULL);
unsigned long vmalloc_max;
if (vmalloc_reserve < SZ_16M) { if (vmalloc_reserve < SZ_16M) {
vmalloc_reserve = SZ_16M; vmalloc_reserve = SZ_16M;
@ -1139,8 +1140,9 @@ static int __init early_vmalloc(char *arg)
vmalloc_reserve >> 20); vmalloc_reserve >> 20);
} }
if (vmalloc_reserve > VMALLOC_END - (PAGE_OFFSET + SZ_32M)) { vmalloc_max = VMALLOC_END - (PAGE_OFFSET + SZ_32M);
vmalloc_reserve = VMALLOC_END - (PAGE_OFFSET + SZ_32M); if (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 %luMB\n",
vmalloc_reserve >> 20); vmalloc_reserve >> 20);
} }