tree 9eec335a778a6bb715feb4fd0b000fa091d02b0f
parent 951c4df5b7703137bf4eee002d98d083fbc890cc
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1242326046 +0000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1242369822 +1000

powerpc/pseries: Really fix the oprofile CPU type on pseries

My previous pach for fixing the oprofile CPU type got somewhat mismerged
(by my fault) when it collided with another related patch. This should
finally (fingers crossed) fix the whole thing.

We make sure we keep the -old- oprofile type and CPU type whenever
one of them was specified in the first pass through the function.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>