diff options
Diffstat (limited to 'arch/openrisc/mm')
| -rw-r--r-- | arch/openrisc/mm/fault.c | 5 | 
1 files changed, 2 insertions, 3 deletions
| diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index 5d4d3a9691d0..8af1cc78c4fb 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -50,7 +50,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,  	struct vm_area_struct *vma;  	int si_code;  	vm_fault_t fault; -	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; +	unsigned int flags = FAULT_FLAG_DEFAULT;  	tsk = current; @@ -161,7 +161,7 @@ good_area:  	fault = handle_mm_fault(vma, address, flags); -	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) +	if (fault_signal_pending(fault, regs))  		return;  	if (unlikely(fault & VM_FAULT_ERROR)) { @@ -181,7 +181,6 @@ good_area:  		else  			tsk->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 |