* [PATCH] powerpc: disable OProfile for iSeries (take 2!)
@ 2006-06-21 1:51 Kelly Daly
2006-06-21 3:10 ` Michael Ellerman
0 siblings, 1 reply; 4+ messages in thread
From: Kelly Daly @ 2006-06-21 1:51 UTC (permalink / raw)
To: paulus, linuxppc64-dev; +Cc: anton
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.
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 -urdp 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-20 15:33:56.000000000 +1000
@@ -137,7 +137,10 @@ int __init oprofile_arch_init(struct opr
{
if (!cur_cpu_spec->oprofile_cpu_type)
return -ENODEV;
-
+#ifdef CONFIG_PPC_ISERIES
+ return -ENODEV;
+#endif
+
switch (cur_cpu_spec->oprofile_type) {
#ifdef CONFIG_PPC64
case PPC_OPROFILE_RS64:
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] powerpc: disable OProfile for iSeries (take 2!)
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
0 siblings, 1 reply; 4+ messages in thread
From: Michael Ellerman @ 2006-06-21 3:10 UTC (permalink / raw)
To: Kelly Daly; +Cc: linuxppc64-dev, paulus, anton
[-- Attachment #1: Type: text/plain, Size: 1681 bytes --]
On Wed, 2006-06-21 at 11:51 +1000, Kelly Daly wrote:
> 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.
>
> 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 -urdp 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-20 15:33:56.000000000 +1000
> @@ -137,7 +137,10 @@ int __init oprofile_arch_init(struct opr
> {
> if (!cur_cpu_spec->oprofile_cpu_type)
> return -ENODEV;
> -
> +#ifdef CONFIG_PPC_ISERIES
> + return -ENODEV;
> +#endif
> +
AFAICT that still doesn't let us build a combined kernel, but I haven't
looked at the code.
cheers
--
Michael Ellerman
IBM OzLabs
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 191 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] powerpc: disable OProfile for iSeries (take 2!)
2006-06-21 3:10 ` Michael Ellerman
@ 2006-06-21 3:52 ` Kelly Daly
2006-06-21 4:32 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Kelly Daly @ 2006-06-21 3:52 UTC (permalink / raw)
To: michael; +Cc: linuxppc64-dev, Kelly Daly, paulus, anton
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:
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] powerpc: disable OProfile for iSeries (take 2!)
2006-06-21 3:52 ` Kelly Daly
@ 2006-06-21 4:32 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2006-06-21 4:32 UTC (permalink / raw)
To: Kelly Daly; +Cc: linuxppc64-dev, kelly, paulus, anton
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
On Wed, 21 Jun 2006 13:52:55 +1000 Kelly Daly <kelly@au1.ibm.com> wrote:
>
> 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>
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-06-21 4:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2006-06-21 4:32 ` Stephen Rothwell
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).