diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-13 13:15:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-13 13:15:50 +0100 |
| commit | 8ad23d861c38c89cb1a16d611b4f5a3c920b1a73 (patch) | |
| tree | f97a38a313419a12793ae074a2d585bad576043c /arch/s390 | |
| parent | e96c5550070c189a8ccb26dc6eae76ee8eef833d (diff) | |
| parent | d6bc7e610ab98da569362b0b64bb20dafee1fcb9 (diff) | |
Merge tag 'v4.4.140' into linux-linaro-lsk-v4.4
This is the 4.4.140 stable release
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 5416d5d68308..4cad1adff16b 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -1170,7 +1170,7 @@ cleanup_critical: jl 0f clg %r9,BASED(.Lcleanup_table+104) # .Lload_fpu_regs_end jl .Lcleanup_load_fpu_regs -0: BR_EX %r14 +0: BR_EX %r14,%r11 .align 8 .Lcleanup_table: @@ -1200,7 +1200,7 @@ cleanup_critical: ni __SIE_PROG0C+3(%r9),0xfe # no longer in SIE lctlg %c1,%c1,__LC_USER_ASCE # load primary asce larl %r9,sie_exit # skip forward to sie_exit - BR_EX %r14 + BR_EX %r14,%r11 #endif .Lcleanup_system_call: |