diff options
| author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2013-07-03 15:04:47 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-02 20:55:18 +0200 |
| commit | 5d6a3c6eeabfac4b30cc21f24892ac63fa371a31 (patch) | |
| tree | 16b9e113830f20a6144aaf184b1eb7d9a162d76e /mm/vmalloc.c | |
| parent | 80a684c48270633bd2dddb8a1af30c419fd091b1 (diff) | |
mm, vmalloc: only call setup_vmalloc_vm() only in __get_vm_area_node()
Now for insert_vmalloc_vm, it only calls the two functions:
- setup_vmalloc_vm: fill vm_struct and vmap_area instances
- clear_vm_unlist: clear VM_UNLIST bit in vm_struct->flags
So in __get_vm_area_node(), if VM_UNLIST bit unset in flags, that is the
else branch here, we don't need to clear VM_UNLIST bit for vm->flags since
this bit is obviously not set. That is to say, we could only call
setup_vmalloc_vm instead of insert_vmalloc_vm here. And then we could
even remove the if test here.
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: Ib1b5eb912cf6bd4d8ccec4afd2807679008c0140
(cherry picked from commit 32c0d2d011a868c8d607b1201df140a3a7b6ca5e)
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index c5c7c8840..4f5211893 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1374,16 +1374,7 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, return NULL; } - /* - * When this function is called from __vmalloc_node_range, - * we add VM_UNLIST flag to avoid accessing uninitialized - * members of vm_struct such as pages and nr_pages fields. - * They will be set later. - */ - if (flags & VM_UNLIST) - setup_vmalloc_vm(area, va, flags, caller); - else - insert_vmalloc_vm(area, va, flags, caller); + setup_vmalloc_vm(area, va, flags, caller); return area; } |