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: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/fpu/internal.h b/arch/s390/include/asm/fpu/internal.h
index 4a71dbbf76fbb5d42de432f18a853e97d94114e2..bbdadb1c9efc6e378d9cf0a16b119ea581d69ebb 100644 (file)
--- a/arch/s390/include/asm/fpu/internal.h
+++ b/arch/s390/include/asm/fpu/internal.h
@@ -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)

diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index eee1ad3e1b291bb308c12ab153be5abde9fa8cfe..cecedd01d4eca2ca70cb4115c1e741da692fd1f3 100644 (file)
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -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;
 }

diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
index c13b1455ec8cae6e4d588d651769fbde3f21a796..8a617be28bb48d2473bc7fae7f8f2c6b7931e5ed 100644 (file)
--- a/arch/s390/kernel/crash_dump.c
+++ b/arch/s390/kernel/crash_dump.c
@@ -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));
 }

diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 53e0209229f87a697d9cb63c0de30ce07cdf027a..cf9659e13f03d9245165561e3cb45ced0aef1c7e 100644 (file)
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -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;
 }

diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 38258f817048d10653f4d803aea0d2d57e104f1a..d63557d3868c1bd1dfd423f2e2ee236ace816703 100644 (file)
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -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;
 }