diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-11-24 02:05:43 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-11-24 02:05:43 +0100 |
| commit | d47f9580839eb6fe568e38b2084d94887fbf5ce0 (patch) | |
| tree | 2493555057f8e5c850590d7438fdbf4472666201 /arch/powerpc/kernel/exceptions-64e.S | |
| parent | Merge tag 'drm-intel-next-2022-11-18' of git://anongit.freedesktop.org/drm/dr... (diff) | |
| parent | Linux 6.1-rc6 (diff) | |
| download | linux-d47f9580839eb6fe568e38b2084d94887fbf5ce0.tar.xz linux-d47f9580839eb6fe568e38b2084d94887fbf5ce0.zip | |
Backmerge tag 'v6.1-rc6' into drm-next
Linux 6.1-rc6
This is needed for drm-misc-next and tegra.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64e.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64e.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index 930e36099015..2f68fb2ee4fc 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -813,6 +813,13 @@ kernel_dbg_exc: EXCEPTION_COMMON(0x260) CHECK_NAPPING() addi r3,r1,STACK_FRAME_OVERHEAD + /* + * XXX: Returning from performance_monitor_exception taken as a + * soft-NMI (Linux irqs disabled) may be risky to use interrupt_return + * and could cause bugs in return or elsewhere. That case should just + * restore registers and return. There is a workaround for one known + * problem in interrupt_exit_kernel_prepare(). + */ bl performance_monitor_exception b interrupt_return |