[POWERPC] Oprofile enhanced instruction sampling support

[linux-2.6-omap-h63xx.git] / arch / powerpc / oprofile / common.c

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index b6d82390b6a6a8bbf854b04d72135ba91439da97..1a7ef7e246d2bb0c069c396ee63ccc23dd2aa92a 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
@@ -158,6 +160,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
                case PPC_OPROFILE_POWER4:
                        model = &op_model_power4;
                        break;
+               case PPC_OPROFILE_PA6T:
+                       model = &op_model_pa6t;
+                       break;
 #endif
 #ifdef CONFIG_6xx
                case PPC_OPROFILE_G4: