提交 0203d6ec 编写于 作者: B Benjamin Herrenschmidt

powerpc: Fix setting of oprofile cpu type

commit 2657dd4e 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: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
上级 9d37a90f
......@@ -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;
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册