diff --git a/[refs] b/[refs]
index 8cead494e4d3..0a03374c4638 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d37a90f9c5271440c8f62b4adc71a726b4b86b6
+refs/heads/master: 0203d6ec4e88062f20558fbed3cdff2af758a53b
diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c
index 5e925dbffbfb..f9c40f869c6e 100644
--- a/trunk/arch/powerpc/kernel/cputable.c
+++ b/trunk/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;
 		}
 	}