aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKelly Daly <kelly@au1.ibm.com>2006-06-20 23:52:55 -0400
committerPaul Mackerras <paulus@samba.org>2006-06-21 01:01:33 -0400
commit2191fe3e39159e3375f4b7ec1420df149f154101 (patch)
treecb196889a369cd8f1d0c0f7b936f61dc91a63f57
parent0bb474a48e5d1ceb8e4005c7664b548c9834a784 (diff)
[POWERPC] re-enable OProfile for iSeries, using timer interrupt
This patch removes the changes from an earlier patch that disables oProfile for iSeries within the oProfile KConfig (submitted Feb 23, 2006). Checks within the arch init for iSeries, still allowing profiling for timer interrupts (using firmware_has_feature). Signed-off-by: Kelly Daly <kelly@au.ibm.com> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/oprofile/Kconfig1
-rw-r--r--arch/powerpc/oprofile/common.c4
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 @@
1config PROFILING 1config PROFILING
2 depends on !PPC_ISERIES
3 bool "Profiling support (EXPERIMENTAL)" 2 bool "Profiling support (EXPERIMENTAL)"
4 help 3 help
5 Say Y here to enable the extended profiling support mechanisms used 4 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 @@
22#include <asm/pmc.h> 22#include <asm/pmc.h>
23#include <asm/cputable.h> 23#include <asm/cputable.h>
24#include <asm/oprofile_impl.h> 24#include <asm/oprofile_impl.h>
25#include <asm/firmware.h>
25 26
26static struct op_powerpc_model *model; 27static struct op_powerpc_model *model;
27 28
@@ -130,6 +131,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
130 if (!cur_cpu_spec->oprofile_cpu_type) 131 if (!cur_cpu_spec->oprofile_cpu_type)
131 return -ENODEV; 132 return -ENODEV;
132 133
134 if (firmware_has_feature(FW_FEATURE_ISERIES))
135 return -ENODEV;
136
133 switch (cur_cpu_spec->oprofile_type) { 137 switch (cur_cpu_spec->oprofile_type) {
134#ifdef CONFIG_PPC64 138#ifdef CONFIG_PPC64
135 case PPC_OPROFILE_RS64: 139 case PPC_OPROFILE_RS64: