diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2022-05-22 23:03:29 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2022-05-22 23:03:29 +0200 |
| commit | da50aad6d86716aa48a2b8463c85caea77c0355f (patch) | |
| tree | c9604cc380e99e613c25ec06cbfcd5009c4575ba /arch/xtensa/kernel/coprocessor.S | |
| parent | power: supply: bq24190_charger: using pm_runtime_resume_and_get instead of pm... (diff) | |
| parent | power: supply: ab8500_fg: Allocate wq in probe (diff) | |
| download | linux-da50aad6d86716aa48a2b8463c85caea77c0355f.tar.xz linux-da50aad6d86716aa48a2b8463c85caea77c0355f.zip | |
Merge power-supply 'fixes' branch
Merge power-supply fixes, that missed the v5.18 merge window
into power-supply's for-next branch.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'arch/xtensa/kernel/coprocessor.S')
| -rw-r--r-- | arch/xtensa/kernel/coprocessor.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S index 45cc0ae0af6f..c7b9f12896f2 100644 --- a/arch/xtensa/kernel/coprocessor.S +++ b/arch/xtensa/kernel/coprocessor.S @@ -29,7 +29,7 @@ .if XTENSA_HAVE_COPROCESSOR(x); \ .align 4; \ .Lsave_cp_regs_cp##x: \ - xchal_cp##x##_store a2 a4 a5 a6 a7; \ + xchal_cp##x##_store a2 a3 a4 a5 a6; \ jx a0; \ .endif @@ -46,7 +46,7 @@ .if XTENSA_HAVE_COPROCESSOR(x); \ .align 4; \ .Lload_cp_regs_cp##x: \ - xchal_cp##x##_load a2 a4 a5 a6 a7; \ + xchal_cp##x##_load a2 a3 a4 a5 a6; \ jx a0; \ .endif |