diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-09-23 10:38:20 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-09-23 10:38:20 -0700 |
| commit | c01f5120ca7cf2994336c42b8a9cae697121ffb3 (patch) | |
| tree | d0ac4ed8e3bc4c11203f31b984d300b0f4127978 /arch/arm/lib/backtrace.S | |
| parent | a4c8723a162e6244fb01944fbf446750575dba59 (diff) | |
| parent | f1f028ff89cb0d37db299d48e7b2ce19be040d52 (diff) | |
| download | linux-c01f5120ca7cf2994336c42b8a9cae697121ffb3.tar.bz2 | |
Merge branch 'fixes-merge-window-pt2' into fixes
Diffstat (limited to 'arch/arm/lib/backtrace.S')
| -rw-r--r-- | arch/arm/lib/backtrace.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S index 1d5210eb4776..582925238d65 100644 --- a/arch/arm/lib/backtrace.S +++ b/arch/arm/lib/backtrace.S @@ -66,7 +66,7 @@ for_each_frame: tst frame, mask @ Check for address exceptions 1003: ldr r2, [sv_pc, #-4] @ if stmfd sp!, {args} exists, ldr r3, .Ldsi+4 @ adjust saved 'pc' back one - teq r3, r2, lsr #10 @ instruction + teq r3, r2, lsr #11 @ instruction subne r0, sv_pc, #4 @ allow for mov subeq r0, sv_pc, #8 @ allow for mov + stmia |