diff options
| author | Rob Herring <robh@kernel.org> | 2018-12-13 18:20:36 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-12-13 18:20:36 +0100 |
| commit | acc2038738bd6f881e7a277ba14fa7c589fd3058 (patch) | |
| tree | fd56524867a9b726b3e5d2cb040ff16b2f2a67a0 /arch/arm/mm | |
| parent | dt-bindings: arm: mrvl: amend Browstone compatible string (diff) | |
| parent | dt-bindings: Convert trivial-devices.txt to json-schema (diff) | |
| download | linux-acc2038738bd6f881e7a277ba14fa7c589fd3058.tar.xz linux-acc2038738bd6f881e7a277ba14fa7c589fd3058.zip | |
Merge branch 'yaml-bindings-for-v4.21' into dt/next
Diffstat (limited to 'arch/arm/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 |