aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-04-29 15:39:38 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-05-01 01:12:05 -0400
commit0203d6ec4e88062f20558fbed3cdff2af758a53b (patch)
treefda8abe7ebbb68c295f92a8c69b162116b0e7bd6 /arch
parent9d37a90f9c5271440c8f62b4adc71a726b4b86b6 (diff)
powerpc: Fix setting of oprofile cpu type
commit 2657dd4e301d4841ed67a4fac7d145ad8f3e1b28 introduced a bug where we would now always override the "real" oprofile CPU type with the "compatible" one provided by a pseudo-PVR in the device-tree which is incorrect and breaks oprofile on all current configs since the "compatible" ones aren't yet recognized. This fixes it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/cputable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 5e925dbffbfb..f9c40f869c6e 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)
1837 * oprofile_cpu_type. 1837 * oprofile_cpu_type.
1838 */ 1838 */
1839 if (old.oprofile_cpu_type == NULL) { 1839 if (old.oprofile_cpu_type == NULL) {
1840 t->oprofile_cpu_type = s->oprofile_cpu_type; 1840 t->oprofile_cpu_type = old.oprofile_cpu_type;
1841 t->oprofile_type = s->oprofile_type; 1841 t->oprofile_type = old.oprofile_type;
1842 } 1842 }
1843 } 1843 }
1844 1844