diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 5e925dbffbfbfecc2c8a728d05413ab31a8b087f..f9c40f869c6e8088abd17d01213377fe5538f985 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1837,8 +1837,8 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s)
 		 * oprofile_cpu_type.
 		 */
 		if (old.oprofile_cpu_type == NULL) {
-			t->oprofile_cpu_type = s->oprofile_cpu_type;
-			t->oprofile_type = s->oprofile_type;
+			t->oprofile_cpu_type = old.oprofile_cpu_type;
+			t->oprofile_type = old.oprofile_type;
 		}
 	}