From c2d13e63bd5930c335cf3fccbebee38053f41174 Mon Sep 17 00:00:00 2001
From: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Date: Fri, 12 Jan 2007 09:56:44 +0900
Subject: [PATCH] --- yaml --- r: 46798 b: refs/heads/master c:
 ef66f796751a214dc8fadaef2f068c3baa8969fa h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/oprofile/common.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f08c9bfee13e..a79d4afe930a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d649bd7b766b9c15c9f5f2f6d8ae0e57303285d0
+refs/heads/master: ef66f796751a214dc8fadaef2f068c3baa8969fa
diff --git a/trunk/arch/powerpc/oprofile/common.c b/trunk/arch/powerpc/oprofile/common.c
index b6d82390b6a6..fbd62eacfdf4 100644
--- a/trunk/arch/powerpc/oprofile/common.c
+++ b/trunk/arch/powerpc/oprofile/common.c
@@ -149,6 +149,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 #ifdef CONFIG_PPC64
 #ifdef CONFIG_PPC_CELL_NATIVE
 		case PPC_OPROFILE_CELL:
+			if (firmware_has_feature(FW_FEATURE_LPAR))
+				return -ENODEV;
 			model = &op_model_cell;
 			break;
 #endif