Merge branch 'linus' into core/iommu

Merge reason: This branch was on an -rc5 base so pull almost-2.6.30
              to resync with the latest upstream fixes and make sure
              the combination works fine.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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;
                 }