diff options
| author |   Heiko Carstens <hca@linux.ibm.com> | 2020-11-23 12:00:42 +0100 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2020-11-23 12:00:42 +0100 |
| commit | 77663819d4901e1f982e69ca336daa1bc830c5d6 (patch) | |
| tree | 67ff78212662803c2b1084bf64aab776fe9de2b9 /arch/s390/kernel/entry.S | |
| parent | init/Kconfig: make COMPILE_TEST depend on !S390 (diff) | |
| parent | s390: fix fpu restore in entry.S (diff) | |
| download | linux-dev-77663819d4901e1f982e69ca336daa1bc830c5d6.tar.xz linux-dev-77663819d4901e1f982e69ca336daa1bc830c5d6.zip | |
Merge branch 'fixes' into features
* fixes:
s390: fix fpu restore in entry.S
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/kernel/entry.S')
| -rw-r--r-- | arch/s390/kernel/entry.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 0a7811d993a7..b454654ce5b5 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -1076,6 +1076,7 @@ EXPORT_SYMBOL(save_fpu_regs) * %r4 */ load_fpu_regs: + stnsm __SF_EMPTY(%r15),0xfc lg %r4,__LC_CURRENT aghi %r4,__TASK_thread TSTMSK __LC_CPU_FLAGS,_CIF_FPU @@ -1107,6 +1108,7 @@ load_fpu_regs: .Lload_fpu_regs_done: ni __LC_CPU_FLAGS+7,255-_CIF_FPU .Lload_fpu_regs_exit: + ssm __SF_EMPTY(%r15) BR_EX %r14 .Lload_fpu_regs_end: ENDPROC(load_fpu_regs) |