diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-03-29 02:14:21 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-03-29 02:14:21 -0400 |
| commit | 38064d3ea62efe0dd15b50fcec321ff75034e0d2 (patch) | |
| tree | 6d01707406d990f0e28b2adf8259f396bf68f0c4 /mm | |
| parent | 2eff4c0d3ace5adee06d780e150d046e3712b2ec (diff) | |
| parent | 555a5d61f1623a0fa7aa012be0c4b24873c17991 (diff) | |
Merge tag 'v3.0.71' into v3.0-rt
This is the 3.0.71 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 037f077b9865..2c56a533e4bc 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2006,8 +2006,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) |