---

yaml --- r: 46798 b: refs/heads/master c: ef66f79 h: refs/heads/master v: v3
git-mirror · Jan 24, 2007 · c2d13e6 · c2d13e6
1 parent 6309e28
commit c2d13e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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