aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/huge_mm.h
diff options
context:
space:
mode:
authorRik van Riel <riel@redhat.com>2011-01-13 18:47:13 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 20:32:46 -0500
commit2c888cfbc1b45508a44763d85ba2e8ac43faff5f (patch)
tree9a7f2214e5d6a01d5724ae63d4d50cddeb2293ff /include/linux/huge_mm.h
parent97562cd243298acf573620c764a1037bd545c9bc (diff)
thp: fix anon memory statistics with transparent hugepages
Count each transparent hugepage as HPAGE_PMD_NR pages in the LRU statistics, so the Active(anon) and Inactive(anon) statistics in /proc/meminfo are correct. Signed-off-by: Rik van Riel <riel@redhat.com> Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/huge_mm.h')
-rw-r--r--include/linux/huge_mm.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 827595228734..9b48c24df260 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -117,11 +117,19 @@ static inline void vma_adjust_trans_huge(struct vm_area_struct *vma,
117 return; 117 return;
118 __vma_adjust_trans_huge(vma, start, end, adjust_next); 118 __vma_adjust_trans_huge(vma, start, end, adjust_next);
119} 119}
120static inline int hpage_nr_pages(struct page *page)
121{
122 if (unlikely(PageTransHuge(page)))
123 return HPAGE_PMD_NR;
124 return 1;
125}
120#else /* CONFIG_TRANSPARENT_HUGEPAGE */ 126#else /* CONFIG_TRANSPARENT_HUGEPAGE */
121#define HPAGE_PMD_SHIFT ({ BUG(); 0; }) 127#define HPAGE_PMD_SHIFT ({ BUG(); 0; })
122#define HPAGE_PMD_MASK ({ BUG(); 0; }) 128#define HPAGE_PMD_MASK ({ BUG(); 0; })
123#define HPAGE_PMD_SIZE ({ BUG(); 0; }) 129#define HPAGE_PMD_SIZE ({ BUG(); 0; })
124 130
131#define hpage_nr_pages(x) 1
132
125#define transparent_hugepage_enabled(__vma) 0 133#define transparent_hugepage_enabled(__vma) 0
126 134
127#define transparent_hugepage_flags 0UL 135#define transparent_hugepage_flags 0UL