diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-06-08 19:14:49 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-08 19:14:49 +0200 |
| commit | 4263eb6880df8383fff0efb872278a99eb6142c8 (patch) | |
| tree | 67ab9bf228e4f5f341f9408e055180932b39fe06 /arch/powerpc/kernel/entry_32.S | |
| parent | bus: ti-sysc: Increase max softreset wait (diff) | |
| parent | ARM: dts: dra7-evm-common: Fix duplicate mailbox nodes (diff) | |
| download | linux-4263eb6880df8383fff0efb872278a99eb6142c8.tar.xz linux-4263eb6880df8383fff0efb872278a99eb6142c8.zip | |
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'arch/powerpc/kernel/entry_32.S')
| -rw-r--r-- | arch/powerpc/kernel/entry_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index a6371fb8f761..8420abd4ea1c 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -732,7 +732,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_SPE) stw r10,_CCR(r1) stw r1,KSP(r3) /* Set old stack pointer */ - kuap_check r2, r4 + kuap_check r2, r0 #ifdef CONFIG_SMP /* We need a sync somewhere here to make sure that if the * previous task gets rescheduled on another CPU, it sees all |