Patched in Tegra support.

4 files changed, 23 insertions, 44 deletions

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 1516d1dc11f..f114a3b14c6 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -16,7 +16,6 @@
  */
 #include <linux/bootmem.h>
 #include <linux/efi.h>
-#include <linux/memblock.h>
 #include <linux/mm.h>
 #include <linux/nmi.h>
 #include <linux/swap.h>
@@ -349,7 +348,7 @@ paging_init (void)
                 printk("Virtual mem_map starts at 0x%p\n", mem_map);
         }
 #else /* !CONFIG_VIRTUAL_MEM_MAP */
-        memblock_add_node(0, PFN_PHYS(max_low_pfn), 0);
+        add_active_range(0, 0, max_low_pfn);
         free_area_init_nodes(max_zone_pfns);
 #endif /* !CONFIG_VIRTUAL_MEM_MAP */
         zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 6cf0341f978..20b35937612 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -14,6 +14,7 @@
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 
 extern int die(char *, struct pt_regs *, long);
@@ -72,10 +73,6 @@ mapped_kernel_page_is_present (unsigned long address)
         return pte_present(pte);
 }
 
-#       define VM_READ_BIT      0
-#       define VM_WRITE_BIT     1
-#       define VM_EXEC_BIT      2
-
 void __kprobes
 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
 {
@@ -85,12 +82,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
         struct siginfo si;
         unsigned long mask;
         int fault;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
-
-        mask = ((((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
-                | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
-
-        flags |= ((mask & VM_WRITE) ? FAULT_FLAG_WRITE : 0);
 
         /* mmap_sem is performance critical.... */
         prefetchw(&mm->mmap_sem);
@@ -119,7 +110,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
         if (notify_page_fault(regs, TRAP_BRKPT))
                 return;
 
-retry:
         down_read(&mm->mmap_sem);
 
         vma = find_vma_prev(mm, address, &prev_vma);
@@ -141,6 +131,10 @@ retry:
 
         /* OK, we've got a good vm_area for this memory area.  Check the access permissions: */
 
+#       define VM_READ_BIT      0
+#       define VM_WRITE_BIT     1
+#       define VM_EXEC_BIT      2
+
 #       if (((1 << VM_READ_BIT) != VM_READ || (1 << VM_WRITE_BIT) != VM_WRITE) \
             || (1 << VM_EXEC_BIT) != VM_EXEC)
 #               error File is out of sync with <linux/mm.h>.  Please update.
@@ -149,6 +143,9 @@ retry:
         if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
                 goto bad_area;
 
+        mask = (  (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
+                | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
+
         if ((vma->vm_flags & mask) != mask)
                 goto bad_area;
 
@@ -157,11 +154,7 @@ retry:
          * sure we exit gracefully rather than endlessly redo the
          * fault.
          */
-        fault = handle_mm_fault(mm, vma, address, flags);
-
-        if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
-                return;
-
+        fault = handle_mm_fault(mm, vma, address, (mask & VM_WRITE) ? FAULT_FLAG_WRITE : 0);
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 /*
                  * We ran out of memory, or some other thing happened
@@ -176,25 +169,10 @@ retry:
                 }
                 BUG();
         }
-
-        if (flags & FAULT_FLAG_ALLOW_RETRY) {
-                if (fault & VM_FAULT_MAJOR)
-                        current->maj_flt++;
-                else
-                        current->min_flt++;
-                if (fault & VM_FAULT_RETRY) {
-                        flags &= ~FAULT_FLAG_ALLOW_RETRY;
-                        flags |= FAULT_FLAG_TRIED;
-
-                         /* No need to up_read(&mm->mmap_sem) as we would
-                         * have already released it in __lock_page_or_retry
-                         * in mm/filemap.c.
-                         */
-
-                        goto retry;
-                }
-        }
-
+        if (fault & VM_FAULT_MAJOR)
+                current->maj_flt++;
+        else
+                current->min_flt++;
         up_read(&mm->mmap_sem);
         return;
 
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index b755ea92aea..00cb0e26c64 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -10,7 +10,6 @@
 #include <linux/bootmem.h>
 #include <linux/efi.h>
 #include <linux/elf.h>
-#include <linux/memblock.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/module.h>
@@ -30,6 +29,7 @@
 #include <asm/pgalloc.h>
 #include <asm/sal.h>
 #include <asm/sections.h>
+#include <asm/system.h>
 #include <asm/tlb.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -138,8 +138,7 @@ ia64_init_addr_space (void)
                         vma->vm_mm = current->mm;
                         vma->vm_end = PAGE_SIZE;
                         vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);
-                        vma->vm_flags = VM_READ | VM_MAYREAD | VM_IO |
-                                        VM_DONTEXPAND | VM_DONTDUMP;
+                        vma->vm_flags = VM_READ | VM_MAYREAD | VM_IO | VM_RESERVED;
                         down_write(&current->mm->mmap_sem);
                         if (insert_vm_struct(current->mm, vma)) {
                                 up_write(&current->mm->mmap_sem);
@@ -294,10 +293,11 @@ setup_gate (void)
         ia64_patch_gate();
 }
 
-void ia64_mmu_init(void *my_cpu_data)
+void __devinit
+ia64_mmu_init (void *my_cpu_data)
 {
         unsigned long pta, impl_va_bits;
-        extern void tlb_init(void);
+        extern void __devinit tlb_init (void);
 
 #ifdef CONFIG_DISABLE_VHPT
 #       define VHPT_ENABLE_BIT  0
@@ -557,7 +557,8 @@ int __init register_active_ranges(u64 start, u64 len, int nid)
 #endif
 
         if (start < end)
-                memblock_add_node(__pa(start), end - start, nid);
+                add_active_range(nid, __pa(start) >> PAGE_SHIFT,
+                        __pa(end) >> PAGE_SHIFT);
         return 0;
 }
 
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index ed612976868..7b3cdc6c6d9 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -337,7 +337,8 @@ flush_tlb_range (struct vm_area_struct *vma, unsigned long start,
 }
 EXPORT_SYMBOL(flush_tlb_range);
 
-void ia64_tlb_init(void)
+void __devinit
+ia64_tlb_init (void)
 {
         ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */
         u64 tr_pgbits;