5 files changed, 16 insertions, 13 deletions

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 54bf54059811..f114a3b14c6a 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -36,7 +36,7 @@ static unsigned long max_gap;
  * Shows a simple page count of reserved and used pages in the system.
  * For discontig machines, it does this on a per-pgdat basis.
  */
-void show_mem(void)
+void show_mem(unsigned int filter)
 {
         int i, total_reserved = 0;
         int total_shared = 0, total_cached = 0;
@@ -44,13 +44,16 @@ void show_mem(void)
         pg_data_t *pgdat;
 
         printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
         printk(KERN_INFO "Node memory in pages:\n");
         for_each_online_pgdat(pgdat) {
                 unsigned long present;
                 unsigned long flags;
                 int shared = 0, cached = 0, reserved = 0;
+                int nid = pgdat->node_id;
 
+                if (skip_free_areas_node(filter, nid))
+                        continue;
                 pgdat_resize_lock(pgdat, &flags);
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -64,8 +67,7 @@ void show_mem(void)
                                 if (max_gap < LARGE_GAP)
                                         continue;
 #endif
-                                i = vmemmap_find_next_valid_pfn(pgdat->node_id,
-                                         i) - 1;
+                                i = vmemmap_find_next_valid_pfn(nid, i) - 1;
                                 continue;
                         }
                         if (PageReserved(page))
@@ -81,7 +83,7 @@ void show_mem(void)
                 total_cached += cached;
                 total_shared += shared;
                 printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
-                       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                       "shrd: %10d, swpd: %10d\n", nid,
                        present, reserved, shared, cached);
         }
         printk(KERN_INFO "%ld pages of RAM\n", total_present);
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 61620323bb60..c641333cd997 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -614,7 +614,7 @@ void __cpuinit *per_cpu_init(void)
  * Shows a simple page count of reserved and used pages in the system.
  * For discontig machines, it does this on a per-pgdat basis.
  */
-void show_mem(void)
+void show_mem(unsigned int filter)
 {
         int i, total_reserved = 0;
         int total_shared = 0, total_cached = 0;
@@ -622,13 +622,16 @@ void show_mem(void)
         pg_data_t *pgdat;
 
         printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
         printk(KERN_INFO "Node memory in pages:\n");
         for_each_online_pgdat(pgdat) {
                 unsigned long present;
                 unsigned long flags;
                 int shared = 0, cached = 0, reserved = 0;
+                int nid = pgdat->node_id;
 
+                if (skip_free_areas_node(filter, nid))
+                        continue;
                 pgdat_resize_lock(pgdat, &flags);
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -638,8 +641,7 @@ void show_mem(void)
                         if (pfn_valid(pgdat->node_start_pfn + i))
                                 page = pfn_to_page(pgdat->node_start_pfn + i);
                         else {
-                                i = vmemmap_find_next_valid_pfn(pgdat->node_id,
-                                         i) - 1;
+                                i = vmemmap_find_next_valid_pfn(nid, i) - 1;
                                 continue;
                         }
                         if (PageReserved(page))
@@ -655,7 +657,7 @@ void show_mem(void)
                 total_cached += cached;
                 total_shared += shared;
                 printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
-                       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                       "shrd: %10d, swpd: %10d\n", nid,
                        present, reserved, shared, cached);
         }
         printk(KERN_INFO "%ld pages of RAM\n", total_present);
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 0799fea4c588..20b359376128 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
+#include <linux/prefetch.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index 1841ee7e65f9..5ca674b74737 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -38,7 +38,7 @@ huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)
         if (pud) {
                 pmd = pmd_alloc(mm, pud, taddr);
                 if (pmd)
-                        pte = pte_alloc_map(mm, pmd, taddr);
+                        pte = pte_alloc_map(mm, NULL, pmd, taddr);
         }
         return pte;
 }
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index ed41759efcac..00cb0e26c64e 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -36,8 +36,6 @@
 #include <asm/mca.h>
 #include <asm/paravirt.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 extern void ia64_tlb_init (void);
 
 unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL;