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

s390/vx: use simple assignments to access __vector128 members 



Use simple assignments to access __vector128 members instead of hard
to read casts.

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent b0b7b43f

arch/s390/include/asm/fpu/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static inline void convert_vx_to_fp(freg_t *fprs, __vector128 *vxrs) 
	int i;



	for (i = 0; i < __NUM_FPRS; i++)

		fprs[i] = *(freg_t *)(vxrs + i);

		fprs[i].ui = vxrs[i].high;

}



static inline void convert_fp_to_vx(__vector128 *vxrs, freg_t *fprs)
@@ -35,7 +35,7 @@ static inline void convert_fp_to_vx(__vector128 *vxrs, freg_t *fprs) 
	int i;



	for (i = 0; i < __NUM_FPRS; i++)

		*(freg_t *)(vxrs + i) = fprs[i];

		vxrs[i].high = fprs[i].ui;

}



static inline void fpregs_store(_s390_fp_regs *fpregs, struct fpu *fpu)

arch/s390/kernel/compat_signal.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int save_sigregs_ext32(struct pt_regs *regs, 
	/* Save vector registers to signal stack */

	if (MACHINE_HAS_VX) {

		for (i = 0; i < __NUM_VXRS_LOW; i++)

			vxrs[i] = *((__u64 *)(current->thread.fpu.vxrs + i) + 1);

			vxrs[i] = current->thread.fpu.vxrs[i].low;

		if (__copy_to_user(&sregs_ext->vxrs_low, vxrs,

				   sizeof(sregs_ext->vxrs_low)) ||

		    __copy_to_user(&sregs_ext->vxrs_high,
@@ -173,7 +173,7 @@ static int restore_sigregs_ext32(struct pt_regs *regs, 
				     sizeof(sregs_ext->vxrs_high)))

			return -EFAULT;

		for (i = 0; i < __NUM_VXRS_LOW; i++)

			*((__u64 *)(current->thread.fpu.vxrs + i) + 1) = vxrs[i];

			current->thread.fpu.vxrs[i].low = vxrs[i];

	}

	return 0;

}

arch/s390/kernel/crash_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void __init save_area_add_vxrs(struct save_area *sa, __vector128 *vxrs) 


	/* Copy lower halves of vector registers 0-15 */

	for (i = 0; i < 16; i++)

		memcpy(&sa->vxrs_low[i], &vxrs[i].u[2], 8);

		sa->vxrs_low[i] = vxrs[i].low;

	/* Copy vector registers 16-31 */

	memcpy(sa->vxrs_high, vxrs + 16, 16 * sizeof(__vector128));

}

arch/s390/kernel/ptrace.c

+3 −3
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ static int s390_vxrs_low_get(struct task_struct *target, 
	if (target == current)

		save_fpu_regs();

	for (i = 0; i < __NUM_VXRS_LOW; i++)

		vxrs[i] = *((__u64 *)(target->thread.fpu.vxrs + i) + 1);

		vxrs[i] = target->thread.fpu.vxrs[i].low;

	return membuf_write(&to, vxrs, sizeof(vxrs));

}
@@ -1008,12 +1008,12 @@ static int s390_vxrs_low_set(struct task_struct *target, 
		save_fpu_regs();



	for (i = 0; i < __NUM_VXRS_LOW; i++)

		vxrs[i] = *((__u64 *)(target->thread.fpu.vxrs + i) + 1);

		vxrs[i] = target->thread.fpu.vxrs[i].low;



	rc = user_regset_copyin(&pos, &count, &kbuf, &ubuf, vxrs, 0, -1);

	if (rc == 0)

		for (i = 0; i < __NUM_VXRS_LOW; i++)

			*((__u64 *)(target->thread.fpu.vxrs + i) + 1) = vxrs[i];

			target->thread.fpu.vxrs[i].low = vxrs[i];



	return rc;

}

arch/s390/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int save_sigregs_ext(struct pt_regs *regs, 
	/* Save vector registers to signal stack */

	if (MACHINE_HAS_VX) {

		for (i = 0; i < __NUM_VXRS_LOW; i++)

			vxrs[i] = *((__u64 *)(current->thread.fpu.vxrs + i) + 1);

			vxrs[i] = current->thread.fpu.vxrs[i].low;

		if (__copy_to_user(&sregs_ext->vxrs_low, vxrs,

				   sizeof(sregs_ext->vxrs_low)) ||

		    __copy_to_user(&sregs_ext->vxrs_high,
@@ -210,7 +210,7 @@ static int restore_sigregs_ext(struct pt_regs *regs, 
				     sizeof(sregs_ext->vxrs_high)))

			return -EFAULT;

		for (i = 0; i < __NUM_VXRS_LOW; i++)

			*((__u64 *)(current->thread.fpu.vxrs + i) + 1) = vxrs[i];

			current->thread.fpu.vxrs[i].low = vxrs[i];

	}

	return 0;

}