Merge branch 'linux-3.8.y' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.8.y

* 'linux-3.8.y' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (99 commits)
  Linux 3.8.5
  rt2x00: error in configurations with mesh support disabled
  ARM: DMA-mapping: add missing GFP_DMA flag for atomic buffer allocation
  usb: musb: da8xx: Fix build breakage due to typo
  USB: io_ti: fix get_icount for two port adapters
  USB: garmin_gps: fix memory leak on disconnect
  udf: Fix bitmap overflow on large filesystems with small block size
  ACPI: Rework acpi_get_child() to be more efficient
  efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
  efivars: Add module parameter to disable use as a pstore backend
  efivars: Allow disabling use as a pstore backend
  USB: serial: fix interface refcounting
  usb: gadget: ffs: fix enable multiple instances
  USB: EHCI: fix regression in QH unlinking
  USB: EHCI: fix regression during bus resume
  USB: cdc-acm: fix device unregistration
  USB: xhci: correctly enable interrupts
  USB: xhci - fix bit definitions for IMAN register
  x86-64: Fix the failure case in copy_user_handle_tail()
  clockevents: Don't allow dummy broadcast timers
  ...

Signed-off-by: Dan Murphy <dmurphy@ti.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 546db81820e..d7cec923b3f 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2127,8 +2127,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)