aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mm/fault.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k/mm/fault.c')
-rw-r--r--arch/m68k/mm/fault.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c
index f2ff3779875a..9b6163c05a75 100644
--- a/arch/m68k/mm/fault.c
+++ b/arch/m68k/mm/fault.c
@@ -70,7 +70,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
70{ 70{
71 struct mm_struct *mm = current->mm; 71 struct mm_struct *mm = current->mm;
72 struct vm_area_struct * vma; 72 struct vm_area_struct * vma;
73 int fault; 73 vm_fault_t fault;
74 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; 74 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
75 75
76 pr_debug("do page fault:\nregs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n", 76 pr_debug("do page fault:\nregs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n",
@@ -136,7 +136,7 @@ good_area:
136 */ 136 */
137 137
138 fault = handle_mm_fault(vma, address, flags); 138 fault = handle_mm_fault(vma, address, flags);
139 pr_debug("handle_mm_fault returns %d\n", fault); 139 pr_debug("handle_mm_fault returns %x\n", fault);
140 140
141 if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) 141 if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
142 return 0; 142 return 0;