projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a1748f8
)
mm: hugetlb_vmemmap: add check of CONFIG_MEMORY_HOTPLUG back
author
Muchun Song
<songmuchun@bytedance.com>
Tue, 5 Dec 2023 03:05:30 +0000
(11:05 +0800)
committer
Andrew Morton
<akpm@linux-foundation.org>
Tue, 12 Dec 2023 18:57:08 +0000
(10:57 -0800)
The compiler will optimize the code as much as possible if we add the
check of CONFIG_MEMORY_HOTPLUG back.
Link:
https://lkml.kernel.org/r/20231205030530.3802-1-songmuchun@bytedance.com
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/hugetlb_vmemmap.c
patch
|
blob
|
history
diff --git
a/mm/hugetlb_vmemmap.c
b/mm/hugetlb_vmemmap.c
index 54f388aa361fb933dbbe8dfd0d61ae57cca26641..2646a2798a0e5eaab093fa160f3558894f5506aa 100644
(file)
--- a/
mm/hugetlb_vmemmap.c
+++ b/
mm/hugetlb_vmemmap.c
@@
-119,7
+119,7
@@
static int vmemmap_pmd_entry(pmd_t *pmd, unsigned long addr,
* +--+ | |
* +------------------------+
*/
- if (unlikely(!vmemmap_walk->nr_walked)) {
+ if (
IS_ENABLED(CONFIG_MEMORY_HOTPLUG) &&
unlikely(!vmemmap_walk->nr_walked)) {
struct page *page = head ? head + pte_index(addr) :
pte_page(ptep_get(pte_offset_kernel(pmd, addr)));