diff options
Diffstat (limited to 'arch/arm/mm/fault.c')
| -rw-r--r-- | arch/arm/mm/fault.c | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 84becc911ee3..3232afb6fdc0 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -224,12 +224,12 @@ static inline bool access_error(unsigned int fsr, struct vm_area_struct *vma)  	return vma->vm_flags & mask ? false : true;  } -static int __kprobes +static vm_fault_t __kprobes  __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,  		unsigned int flags, struct task_struct *tsk)  {  	struct vm_area_struct *vma; -	int fault; +	vm_fault_t fault;  	vma = find_vma(mm, addr);  	fault = VM_FAULT_BADMAP; @@ -264,7 +264,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)  {  	struct task_struct *tsk;  	struct mm_struct *mm; -	int fault, sig, code; +	int sig, code; +	vm_fault_t fault;  	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;  	if (notify_page_fault(regs, fsr)) |