diff options
| author | Kelly Daly <kelly@au1.ibm.com> | 2006-06-21 03:52:55 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-21 05:01:33 (GMT) |
| commit | 2191fe3e39159e3375f4b7ec1420df149f154101 (patch) | |
| tree | cb196889a369cd8f1d0c0f7b936f61dc91a63f57 /arch/powerpc/oprofile/common.c | |
| parent | 0bb474a48e5d1ceb8e4005c7664b548c9834a784 (diff) | |
| download | linux-fsl-qoriq-2191fe3e39159e3375f4b7ec1420df149f154101.tar.xz | |
[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>
Diffstat (limited to 'arch/powerpc/oprofile/common.c')
| -rw-r--r-- | arch/powerpc/oprofile/common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c index 38a2f9c..27ad56b 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: |