---

yaml --- r: 144570 b: refs/heads/master c: 0203d6e h: refs/heads/master v: v3
git-mirror · May 1, 2009 · 1f7aea4 · 1f7aea4
1 parent 46068f5
commit 1f7aea4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 		}
 	}