commit 3ad26e5c4459d3793ad65bc8929037c70515df83
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Fri Oct 11 18:23:53 2013 +1100
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> Fri Oct 11 18:23:53 2013 +1100
tree 434327df7942878383e372988eb5f3bccb25de12
parent 5293bf97a27e1be8ac6096aa198ff6a9e3e6837c
parent 18461960cbf50bf345ef0667d45d5f64de8fb893

Merge branch 'for-kvm' into next

Topic branch for commits that the KVM tree might want to pull
in separately.

Hand merged a few files due to conflicts with the LE stuff

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

arch/powerpc/kernel/align.c

diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index 59f70ad..6e3f977 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -652,9 +652,9 @@
 	flush_vsx_to_thread(current);
 
 	if (reg < 32)
-		ptr = (char *) &current->thread.fpr[reg][0];
+		ptr = (char *) &current->thread.fp_state.fpr[reg][0];
 	else
-		ptr = (char *) &current->thread.vr[reg - 32];
+		ptr = (char *) &current->thread.vr_state.vr[reg - 32];
 
 	lptr = (unsigned long *) ptr;
 
@@ -944,7 +944,7 @@
 			return -EFAULT;
 
 	} else if (flags & F) {
-		data.dd = current->thread.TS_FPR(reg);
+		data.ll = current->thread.TS_FPR(reg);
 		if (flags & S) {
 			/* Single-precision FP store requires conversion... */
 #ifdef CONFIG_PPC_FPU
@@ -1021,7 +1021,7 @@
 		if (unlikely(ret))
 			return -EFAULT;
 	} else if (flags & F)
-		current->thread.TS_FPR(reg) = data.dd;
+		current->thread.TS_FPR(reg) = data.ll;
 	else
 		regs->gpr[reg] = data.ll;