diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-06 19:10:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-06 19:10:01 +0300 |
| commit | 4581aa96475b792de4b1206a12830339b65ec246 (patch) | |
| tree | 0e81a170a30ce89aa1d9d2993ea313c199617372 | |
| parent | a13511dfa836c8305a737436eed3ba9a8e74a826 (diff) | |
| parent | 6282e916f774e37845c65d1eae9f8c649004f033 (diff) | |
| download | linux-4581aa96475b792de4b1206a12830339b65ec246.tar.xz | |
Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"Ard spotted a typo in one of the assembly files which leads to a
kernel oops when that code path is executed. Fix this"
* 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8809/1: proc-v7: fix Thumb annotation of cpu_v7_hvc_switch_mm
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 6fe52819e014..339eb17c9808 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -112,7 +112,7 @@ ENTRY(cpu_v7_hvc_switch_mm) hvc #0 ldmfd sp!, {r0 - r3} b cpu_v7_switch_mm -ENDPROC(cpu_v7_smc_switch_mm) +ENDPROC(cpu_v7_hvc_switch_mm) #endif ENTRY(cpu_v7_iciallu_switch_mm) mov r3, #0 |