[PATCH] powerpc: disable OProfile for iSeries (take 2!)

[Michael Ellerman]

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 at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20060621/a668a6c7/attachment.pgp>