diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index e08b32ccf1d96fb99941bbd6340b0bf804188607..d245f0af412a7994614a78ea0630be4ff268aece 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -2980,6 +2980,9 @@ long arch_ptrace(struct task_struct *child, long request,
 	void __user *datavp = (void __user *) data;
 	unsigned long __user *datalp = datavp;
 
+	// ptrace_get/put_fpr() rely on PPC32 and VSX being incompatible
+	BUILD_BUG_ON(IS_ENABLED(CONFIG_PPC32) && IS_ENABLED(CONFIG_VSX));
+
 	switch (request) {
 	/* read the word at location addr in the USER area. */
 	case PTRACE_PEEKUSR: {
@@ -3006,10 +3009,13 @@ long arch_ptrace(struct task_struct *child, long request,
 			unsigned int fpidx = index - PT_FPR0;
 
 			flush_fp_to_thread(child);
-			if (fpidx < (PT_FPSCR - PT_FPR0))
-				memcpy(&tmp, &child->thread.TS_FPR(fpidx),
-				       sizeof(long));
-			else
+			if (fpidx < (PT_FPSCR - PT_FPR0)) {
+				if (IS_ENABLED(CONFIG_PPC32))
+					// On 32-bit the index we are passed refers to 32-bit words
+					tmp = ((u32 *)child->thread.fp_state.fpr)[fpidx];
+				else
+					memcpy(&tmp, &child->thread.TS_FPR(fpidx), sizeof(long));
+			} else
 				tmp = child->thread.fp_state.fpscr;
 		}
 		ret = put_user(tmp, datalp);
@@ -3039,10 +3045,13 @@ long arch_ptrace(struct task_struct *child, long request,
 			unsigned int fpidx = index - PT_FPR0;
 
 			flush_fp_to_thread(child);
-			if (fpidx < (PT_FPSCR - PT_FPR0))
-				memcpy(&child->thread.TS_FPR(fpidx), &data,
-				       sizeof(long));
-			else
+			if (fpidx < (PT_FPSCR - PT_FPR0)) {
+				if (IS_ENABLED(CONFIG_PPC32))
+					// On 32-bit the index we are passed refers to 32-bit words
+					((u32 *)child->thread.fp_state.fpr)[fpidx] = data;
+				else
+					memcpy(&child->thread.TS_FPR(fpidx), &data, sizeof(long));
+			} else
 				child->thread.fp_state.fpscr = data;
 			ret = 0;
 		}