ia64: drop marked broken DISCONTIGMEM and VIRTUAL_MEM_MAP

[sfrench/cifs-2.6.git] / arch / ia64 / mm / fault.c

diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index cd9766d2b6e0e054f71d855a8a1e46ea66913bc1..02de2e70c5874dfd50fba2cc50437d9c2ad82da0 100644 (file)
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -84,18 +84,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
        if (faulthandler_disabled() || !mm)
                goto no_context;
 
-#ifdef CONFIG_VIRTUAL_MEM_MAP
-       /*
-        * If fault is in region 5 and we are in the kernel, we may already
-        * have the mmap_lock (pfn_valid macro is called during mmap). There
-        * is no vma for region 5 addr's anyway, so skip getting the semaphore
-        * and go directly to the exception handling code.
-        */
-
-       if ((REGION_NUMBER(address) == 5) && !user_mode(regs))
-               goto bad_area_no_up;
-#endif
-
        /*
         * This is to handle the kprobes on user space access instructions
         */
@@ -213,9 +201,6 @@ retry:
 
   bad_area:
        mmap_read_unlock(mm);
-#ifdef CONFIG_VIRTUAL_MEM_MAP
-  bad_area_no_up:
-#endif
        if ((isr & IA64_ISR_SP)
            || ((isr & IA64_ISR_NA) && (isr & IA64_ISR_CODE_MASK) == IA64_ISR_CODE_LFETCH))
        {