Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / arch / powerpc / oprofile / common.c

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index b6d82390b6a6a8bbf854b04d72135ba91439da97..fbd62eacfdf4264c5620167ce78edc77f157654b 100644 (file)
--- a/arch/powerpc/oprofile/common.c
+++ b/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