Commit 0203d6ec authored Apr 29, 2009 by 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 9d37a90f

arch/powerpc/kernel/cputable.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}