diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2022-02-09 20:00:28 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2022-02-09 20:00:28 +0200 |
| commit | 2e69f2ae550dcfbde1ffb6daa11492762b122191 (patch) | |
| tree | 598e8922509ca50771d3a609d0c63eca90a1ecb2 /arch/parisc/kernel | |
| parent | 82e44f01405d6fcccef53c5d2c95cf2fbbda9075 (diff) | |
| parent | 5626e6fca8c361bc552bf8005d19c301eddea784 (diff) | |
Merge remote-tracking branch 'msm8998/lineage-18.1' into lineage-18.1
Change-Id: I073391b643e7886de4ca06ca24caab848510f2bd
Diffstat (limited to 'arch/parisc/kernel')
| -rw-r--r-- | arch/parisc/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 6f61a17e2485..55e7ba06511d 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c @@ -796,7 +796,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) * unless pagefault_disable() was called before. */ - if (fault_space == 0 && !faulthandler_disabled()) + if (faulthandler_disabled() || fault_space == 0) { /* Clean up and return if in exception table. */ if (fixup_exception(regs)) |