aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm/fault.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/mm/fault.c')
-rw-r--r--arch/ia64/mm/fault.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index ff62551eb3a1..839d4f1234ee 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -229,9 +229,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
229 return; 229 return;
230 } 230 }
231 231
232 if (ia64_done_with_exception(regs))
233 return;
234
235 /* 232 /*
236 * Since we have no vma's for region 5, we might get here even if the address is 233 * Since we have no vma's for region 5, we might get here even if the address is
237 * valid, due to the VHPT walker inserting a non present translation that becomes 234 * valid, due to the VHPT walker inserting a non present translation that becomes
@@ -242,6 +239,9 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
242 if (REGION_NUMBER(address) == 5 && mapped_kernel_page_is_present(address)) 239 if (REGION_NUMBER(address) == 5 && mapped_kernel_page_is_present(address))
243 return; 240 return;
244 241
242 if (ia64_done_with_exception(regs))
243 return;
244
245 /* 245 /*
246 * Oops. The kernel tried to access some bad page. We'll have to terminate things 246 * Oops. The kernel tried to access some bad page. We'll have to terminate things
247 * with extreme prejudice. 247 * with extreme prejudice.