diff options
Diffstat (limited to 'arch/arm/mm/fault.c')
| -rw-r--r-- | arch/arm/mm/fault.c | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index ff8b0aa2dfde..42f585379e19 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -315,8 +315,11 @@ retry:  	 * signal first. We do not need to release the mmap_sem because  	 * it would already be released in __lock_page_or_retry in  	 * mm/filemap.c. */ -	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) +	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) { +		if (!user_mode(regs)) +			goto no_context;  		return 0; +	}  	/*  	 * Major/minor page fault accounting is only done on the |