Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

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

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 7a423437977ce5e43d20ce08bf142f4f8868ca77..1a7ef7e246d2bb0c069c396ee63ccc23dd2aa92a 100644 (file)
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -147,8 +147,10 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 
        switch (cur_cpu_spec->oprofile_type) {
 #ifdef CONFIG_PPC64
-#ifdef CONFIG_PPC_CELL
+#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: