mm: THP: meminfo: modify areas of kernel configurations 96/263696/1
authorSung-hun Kim <sfoon.kim@samsung.com>
Wed, 8 Sep 2021 07:59:12 +0000 (16:59 +0900)
committerSung-hun Kim <sfoon.kim@samsung.com>
Wed, 8 Sep 2021 07:59:12 +0000 (16:59 +0900)
This commit modifies coverages of ifdef macros of
CONFIG_TRANSPARENT_HUGEPAGE and CONFIG_FINEGRAINED_THP to
build properly by removing dependency problems.

Fixes: 7d5372737d34 ("mm: THP: introducing a fine-grained transparent hugepage technique for ARM64 architecture")
Change-Id: Id5e692eb2f89a0f93c696e9c20339940f7107874
Signed-off-by: Sung-hun Kim <sfoon.kim@samsung.com>
fs/proc/meminfo.c

index 9a78266..014f197 100644 (file)
@@ -151,13 +151,12 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
 #ifdef CONFIG_FINEGRAINED_THP
        show_val_kb(m, "FileCPteMapped: ",
                    global_node_page_state(NR_FILE_PTEMAPPED) * HPAGE_CONT_PTE_NR);
-#endif /* CONFIG_FINEGRAINED_THP */
-#endif
        show_val_kb(m, "PhysCPteMapped: ",
                    phys_cont_pte_pages());
+#endif /* CONFIG_FINEGRAINED_THP */
        show_val_kb(m, "PhysPmdMapped:  ",
                    phys_huge_pmd_pages() * HPAGE_PMD_NR);
-
+#endif
 #ifdef CONFIG_CMA
        show_val_kb(m, "CmaTotal:       ", totalcma_pages);
        show_val_kb(m, "CmaFree:        ",