diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-08-09 15:28:08 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-08-09 15:28:08 +0200 |
| commit | 01a620d491592ead12eca039fe1c9e74908c35cf (patch) | |
| tree | 15271737ef24a7375f01eb928595ea3ba13c13ad /arch/riscv/mm/fault.c | |
| parent | 74b0666f97f9455bc799405b7874df62fcb66bae (diff) | |
| parent | 9ba48db9f77ce0001dbb882476fa46e092feb695 (diff) | |
| download | linux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.gz linux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.bz2 linux-01a620d491592ead12eca039fe1c9e74908c35cf.zip | |
Merge tag 'i2c-host-fixes-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
Two fixes on the Qualcomm GENI I2C controller are cleaning up the
error exit patch in the runtime_resume() function. The first is
disabling the clock, the second disables the icc on the way out.
Diffstat (limited to 'arch/riscv/mm/fault.c')
| -rw-r--r-- | arch/riscv/mm/fault.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index 5224f3733802..a9f2b4af8f3f 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -61,26 +61,27 @@ static inline void no_context(struct pt_regs *regs, unsigned long addr) static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_fault_t fault) { + if (!user_mode(regs)) { + no_context(regs, addr); + return; + } + if (fault & VM_FAULT_OOM) { /* * We ran out of memory, call the OOM killer, and return the userspace * (which will retry the fault, or kill us if we got oom-killed). */ - if (!user_mode(regs)) { - no_context(regs, addr); - return; - } pagefault_out_of_memory(); return; } else if (fault & (VM_FAULT_SIGBUS | VM_FAULT_HWPOISON | VM_FAULT_HWPOISON_LARGE)) { /* Kernel mode? Handle exceptions or die */ - if (!user_mode(regs)) { - no_context(regs, addr); - return; - } do_trap(regs, SIGBUS, BUS_ADRERR, addr); return; + } else if (fault & VM_FAULT_SIGSEGV) { + do_trap(regs, SIGSEGV, SEGV_MAPERR, addr); + return; } + BUG(); } |