xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-4.16/nfit' into libnvdimm-for-next

Browse Source
This commit is contained in:
Ross Zwisler
2018-02-03 00:26:26 -07:00
parent d121f07691 f81e1d35a6
commit ee95f4059a
475 changed files with 6115 additions and 1920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/mm/fault.c
View File

@@ -145,6 +145,11 @@ static noinline int bad_area(struct pt_regs *regs, unsigned long address)
return __bad_area(regs, address, SEGV_MAPERR);
}
static noinline int bad_access(struct pt_regs *regs, unsigned long address)
{
return __bad_area(regs, address, SEGV_ACCERR);
}
static int do_sigbus(struct pt_regs *regs, unsigned long address,
unsigned int fault)
{
@@ -490,7 +495,7 @@ retry:
good_area:
if (unlikely(access_error(is_write, is_exec, vma)))
return bad_area(regs, address);
return bad_access(regs, address);
/*
* If for any reason at all we couldn't handle the fault,