From b7402035ca77d73e2e369742d06f498231ea75a2 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 14 May 2009 18:34:06 +0000
Subject: [PATCH] --- yaml --- r: 144991 b: refs/heads/master c:
 b173f03d7c48d3346541f26e0b29690dbadca279 h: refs/heads/master i:   144989:
 27480d2955a873f3f75d361021792ff34c8889c5   144987:
 92ad7fafbb9687901dedd06b85c7ba5c55903d21   144983:
 05b4c8ba71f0ba40d7bc477c146d0ba759f8b879   144975:
 f063a4b1cd07098411e70594a1c43b1c6679bfd0   144959:
 6b73fb71452c5b098b98d81248c677dfa9e3e68b v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/cputable.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d92e0eeea06c..dec980b933c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 951c4df5b7703137bf4eee002d98d083fbc890cc
+refs/heads/master: b173f03d7c48d3346541f26e0b29690dbadca279
diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c
index f9c40f869c6e..3e33fb933d99 100644
--- a/trunk/arch/powerpc/kernel/cputable.c
+++ b/trunk/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;
 		}