From cbf01eb177a7a2aad45c0e35b8a820ae967fb6fa Mon Sep 17 00:00:00 2001 From: Wanpeng Li Date: Fri, 22 Mar 2013 15:04:40 -0700 Subject: [PATCH] --- yaml --- r: 361667 b: refs/heads/master c: d00285884c0892bb1310df96bce6056e9ce9b9d9 h: refs/heads/master i: 361665: 730f66929653ba941a446186d6a308dd63fa7fe5 361663: 5d919a9189ceb74f325d9c8627eeb7c428428aab v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 986606556509..9a41e1b22ae4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc72c32e1fd872a9a4fdfe645283c9dcd68e556d +refs/heads/master: d00285884c0892bb1310df96bce6056e9ce9b9d9 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index 0a0be33bb199..ca9a7c6d7e97 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -2124,8 +2124,12 @@ int hugetlb_report_node_meminfo(int nid, char *buf) /* Return the number pages of memory we physically have, in PAGE_SIZE units. */ unsigned long hugetlb_total_pages(void) { - struct hstate *h = &default_hstate; - return h->nr_huge_pages * pages_per_huge_page(h); + struct hstate *h; + unsigned long nr_total_pages = 0; + + for_each_hstate(h) + nr_total_pages += h->nr_huge_pages * pages_per_huge_page(h); + return nr_total_pages; } static int hugetlb_acct_memory(struct hstate *h, long delta)