Commit 77663819 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

Merge branch 'fixes' into features 



* fixes:
  s390: fix fpu restore in entry.S

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parents 334ef6ed 1179f170

arch/s390/kernel/asm-offsets.c

+5 −5
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ int main(void) 
	/* stack_frame offsets */

	OFFSET(__SF_BACKCHAIN, stack_frame, back_chain);

	OFFSET(__SF_GPRS, stack_frame, gprs);

	OFFSET(__SF_EMPTY, stack_frame, empty1);

	OFFSET(__SF_SIE_CONTROL, stack_frame, empty1[0]);

	OFFSET(__SF_SIE_SAVEAREA, stack_frame, empty1[1]);

	OFFSET(__SF_SIE_REASON, stack_frame, empty1[2]);

	OFFSET(__SF_SIE_FLAGS, stack_frame, empty1[3]);

	OFFSET(__SF_EMPTY, stack_frame, empty1[0]);

	OFFSET(__SF_SIE_CONTROL, stack_frame, empty1[1]);

	OFFSET(__SF_SIE_SAVEAREA, stack_frame, empty1[2]);

	OFFSET(__SF_SIE_REASON, stack_frame, empty1[3]);

	OFFSET(__SF_SIE_FLAGS, stack_frame, empty1[4]);

	BLANK();

	OFFSET(__VDSO_GETCPU_VAL, vdso_per_cpu_data, getcpu_val);

	BLANK();

arch/s390/kernel/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -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)