diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-14 20:34:06 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-15 08:43:42 +0200 |
| commit | b173f03d7c48d3346541f26e0b29690dbadca279 (patch) | |
| tree | 9eec335a778a6bb715feb4fd0b000fa091d02b0f | |
| parent | serial/nwpserial: Fix wrong register read address and add interrupt acknowledge. (diff) | |
| download | linux-b173f03d7c48d3346541f26e0b29690dbadca279.tar.xz linux-b173f03d7c48d3346541f26e0b29690dbadca279.zip | |
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>
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index f9c40f869c6e..3e33fb933d99 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -1836,7 +1836,7 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s) * and, in that case, keep the current value for * oprofile_cpu_type. */ - if (old.oprofile_cpu_type == NULL) { + if (old.oprofile_cpu_type != NULL) { t->oprofile_cpu_type = old.oprofile_cpu_type; t->oprofile_type = old.oprofile_type; } |