From: Kelly Daly <kelly@au1.ibm.com>
To: michael@ellerman.id.au
Cc: linuxppc64-dev@ozlabs.org, Kelly Daly <kelly@au1.ibm.com>,
paulus@samba.org, anton@samba.org
Subject: Re: [PATCH] powerpc: disable OProfile for iSeries (take 2!)
Date: Wed, 21 Jun 2006 13:52:55 +1000 [thread overview]
Message-ID: <200606211352.55446.kelly@au.ibm.com> (raw)
In-Reply-To: <1150859433.8293.9.camel@localhost.localdomain>
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>
---
diff -urdp linux-2.6.16.20/arch/powerpc/oprofile/Kconfig linux-2.6.16.20_kel/arch/powerpc/oprofile/Kconfig
--- linux-2.6.16.20/arch/powerpc/oprofile/Kconfig 2006-06-06 03:18:23.000000000 +1000
+++ linux-2.6.16.20_kel/arch/powerpc/oprofile/Kconfig 2006-06-20 15:53:02.000000000 +1000
@@ -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 -urp linux-2.6.16.20/arch/powerpc/oprofile/common.c linux-2.6.16.20_kel/arch/powerpc/oprofile/common.c
--- linux-2.6.16.20/arch/powerpc/oprofile/common.c 2006-06-06 03:18:23.000000000 +1000
+++ linux-2.6.16.20_kel/arch/powerpc/oprofile/common.c 2006-06-21 13:42:14.000000000 +1000
@@ -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;
@@ -138,6 +139,9 @@ int __init oprofile_arch_init(struct opr
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:
next prev parent reply other threads:[~2006-06-21 3:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-21 1:51 [PATCH] powerpc: disable OProfile for iSeries (take 2!) Kelly Daly
2006-06-21 3:10 ` Michael Ellerman
2006-06-21 3:52 ` Kelly Daly [this message]
2006-06-21 4:32 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200606211352.55446.kelly@au.ibm.com \
--to=kelly@au1.ibm.com \
--cc=anton@samba.org \
--cc=linuxppc64-dev@ozlabs.org \
--cc=michael@ellerman.id.au \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).