diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-23 02:33:06 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-23 02:33:06 +0000 |
| commit | 9c032b533b870102c1929870059ec2c089a31f2b (patch) | |
| tree | 87f979a767aaa305300bcb7720d0ae52f43096c8 /arch/powerpc | |
| parent | 9ad0ea90a166b728745bdbef04f573a4eed811fd (diff) | |
| parent | 78c39820dc30c73f5b69c3fe2269ad9b0840a61a (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index a67c6d781c52..d154e333f76b 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -294,7 +294,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, * can result in fault, which will cause a deadlock when called with * mmap_sem held */ - if (user_mode(regs)) + if (!is_exec && user_mode(regs)) store_update_sp = store_updates_sp(regs); if (user_mode(regs)) |