From f2bdd730100ebfe8d5a83c8e500a1a1108a47cf8 Mon Sep 17 00:00:00 2001 From: Kelly Daly Date: Wed, 21 Jun 2006 13:52:55 +1000 Subject: [PATCH] --- yaml --- r: 28810 b: refs/heads/master c: 2191fe3e39159e3375f4b7ec1420df149f154101 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/oprofile/Kconfig | 1 - trunk/arch/powerpc/oprofile/common.c | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 00f10e10d703..22ee2c0a1e26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bb474a48e5d1ceb8e4005c7664b548c9834a784 +refs/heads/master: 2191fe3e39159e3375f4b7ec1420df149f154101 diff --git a/trunk/arch/powerpc/oprofile/Kconfig b/trunk/arch/powerpc/oprofile/Kconfig index d03c0e5ca870..eb2dece76a54 100644 --- a/trunk/arch/powerpc/oprofile/Kconfig +++ b/trunk/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/trunk/arch/powerpc/oprofile/common.c b/trunk/arch/powerpc/oprofile/common.c index 38a2f9c17187..27ad56bd227e 100644 --- a/trunk/arch/powerpc/oprofile/common.c +++ b/trunk/arch/powerpc/oprofile/common.c @@ -22,6 +22,7 @@ #include #include #include +#include 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: