diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-07-27 15:54:23 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-07-27 15:54:23 +0300 |
| commit | 3b9adfbba5af9e1e83897e832fbe6f5778bfc5d3 (patch) | |
| tree | a0f52a085c63c164643a5f49fae820752a58b2a2 /arch/powerpc/kernel/traps.c | |
| parent | 8019a4ab3d80c7af391a646cccff953753fc025f (diff) | |
| parent | f85739c0b2b0d98a32f5ca4fcc5501d2b76df4f6 (diff) | |
| download | linux-3b9adfbba5af9e1e83897e832fbe6f5778bfc5d3.tar.xz | |
Merge tag 'asoc-fix-v6.5-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.5
A collection of device specific fixes, none particularly remarkable.
There's a set of repetitive fixes for the RealTek drivers fixing an
issue with suspend that was replicated in multiple drivers.
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index e59ec6d32d37..7ef147e2a20d 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -1508,13 +1508,8 @@ static void do_program_check(struct pt_regs *regs) if (!(regs->msr & MSR_PR) && /* not user-mode */ report_bug(bugaddr, regs) == BUG_TRAP_TYPE_WARN) { - const struct exception_table_entry *entry; - - entry = search_exception_tables(bugaddr); - if (entry) { - regs_set_return_ip(regs, extable_fixup(entry) + regs->nip - bugaddr); - return; - } + regs_add_return_ip(regs, 4); + return; } if (cpu_has_feature(CPU_FTR_DEXCR_NPHIE) && user_mode(regs)) { |