1 files changed, 3 insertions, 5 deletions

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index faaca21a3718..f225dd72968b 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -68,7 +68,7 @@ max_pgt_pages(void)
 #ifndef CONFIG_NUMA
         node_free_pages = nr_free_pages();
 #else
-        node_free_pages = nr_free_pages_pgdat(NODE_DATA(numa_node_id()));
+        node_free_pages = node_page_state(numa_node_id(), NR_FREE_PAGES);
 #endif
         max_pgt_pages = node_free_pages / PGT_FRACTION_OF_NODE_MEM;
         max_pgt_pages = max(max_pgt_pages, MIN_PGT_PAGES);
@@ -176,9 +176,8 @@ ia64_init_addr_space (void)
          * the problem.  When the process attempts to write to the register backing store
          * for the first time, it will get a SEGFAULT in this case.
          */
-        vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
         if (vma) {
-                memset(vma, 0, sizeof(*vma));
                 vma->vm_mm = current->mm;
                 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
                 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -195,9 +194,8 @@ ia64_init_addr_space (void)
 
         /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */
         if (!(current->personality & MMAP_PAGE_ZERO)) {
-                vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+                vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
                 if (vma) {
-                        memset(vma, 0, sizeof(*vma));
                         vma->vm_mm = current->mm;
                         vma->vm_end = PAGE_SIZE;
                         vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);