2 files changed, 4 insertions, 1 deletions

diff --git a/arch/powerpc/oprofile/Kconfig b/arch/powerpc/oprofile/Kconfig
index d03c0e5ca870..eb2dece76a54 100644
--- a/arch/powerpc/oprofile/Kconfig
+++ b/arch/powerpc/oprofile/Kconfig
@@ -1,5 +1,4 @@
 config PROFILING
-        depends on !PPC_ISERIES
         bool "Profiling support (EXPERIMENTAL)"
         help
           Say Y here to enable the extended profiling support mechanisms used
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 38a2f9c17187..27ad56bd227e 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -22,6 +22,7 @@
 #include <asm/pmc.h>
 #include <asm/cputable.h>
 #include <asm/oprofile_impl.h>
+#include <asm/firmware.h>
 
 static struct op_powerpc_model *model;
 
@@ -130,6 +131,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         if (!cur_cpu_spec->oprofile_cpu_type)
                 return -ENODEV;
 
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
+
         switch (cur_cpu_spec->oprofile_type) {
 #ifdef CONFIG_PPC64
                 case PPC_OPROFILE_RS64: