diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2022-02-09 20:00:28 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2022-02-09 20:00:28 +0200 |
| commit | 2e69f2ae550dcfbde1ffb6daa11492762b122191 (patch) | |
| tree | 598e8922509ca50771d3a609d0c63eca90a1ecb2 /arch/arm/kernel/entry-armv.S | |
| parent | 82e44f01405d6fcccef53c5d2c95cf2fbbda9075 (diff) | |
| parent | 5626e6fca8c361bc552bf8005d19c301eddea784 (diff) | |
Merge remote-tracking branch 'msm8998/lineage-18.1' into lineage-18.1
Change-Id: I073391b643e7886de4ca06ca24caab848510f2bd
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 3ce377f7251f..618ceb6fe674 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -625,11 +625,9 @@ call_fpe: tstne r0, #0x04000000 @ bit 26 set on both ARM and Thumb-2 reteq lr and r8, r0, #0x00000f00 @ mask out CP number - THUMB( lsr r8, r8, #8 ) mov r7, #1 - add r6, r10, #TI_USED_CP - ARM( strb r7, [r6, r8, lsr #8] ) @ set appropriate used_cp[] - THUMB( strb r7, [r6, r8] ) @ set appropriate used_cp[] + add r6, r10, r8, lsr #8 @ add used_cp[] array offset first + strb r7, [r6, #TI_USED_CP] @ set appropriate used_cp[] #ifdef CONFIG_IWMMXT @ Test if we need to give access to iWMMXt coprocessors ldr r5, [r10, #TI_FLAGS] @@ -638,7 +636,7 @@ call_fpe: bcs iwmmxt_task_enable #endif ARM( add pc, pc, r8, lsr #6 ) - THUMB( lsl r8, r8, #2 ) + THUMB( lsr r8, r8, #6 ) THUMB( add pc, r8 ) nop |