Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2191fe3e authored Jun 21, 2006 by Kelly Daly Committed by Paul Mackerras Jun 21, 2006

[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>

parent 0bb474a4

arch/powerpc/oprofile/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	config PROFILING		config PROFILING
	depends on !PPC_ISERIES
	bool "Profiling support (EXPERIMENTAL)"		bool "Profiling support (EXPERIMENTAL)"
	help		help
	Say Y here to enable the extended profiling support mechanisms used		Say Y here to enable the extended profiling support mechanisms used

arch/powerpc/oprofile/common.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@
	#include <asm/pmc.h>		#include <asm/pmc.h>
	#include <asm/cputable.h>		#include <asm/cputable.h>
	#include <asm/oprofile_impl.h>		#include <asm/oprofile_impl.h>
			#include <asm/firmware.h>

	static struct op_powerpc_model *model;		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)		if (!cur_cpu_spec->oprofile_cpu_type)
	return -ENODEV;		return -ENODEV;

			if (firmware_has_feature(FW_FEATURE_ISERIES))
			return -ENODEV;

	switch (cur_cpu_spec->oprofile_type) {		switch (cur_cpu_spec->oprofile_type) {
	#ifdef CONFIG_PPC64		#ifdef CONFIG_PPC64
	case PPC_OPROFILE_RS64:		case PPC_OPROFILE_RS64: