Skip to content

Commit

Permalink
[PATCH] ppc64: silence perfmon exception warnings
Browse files Browse the repository at this point in the history
We dont need to use the PERFMON exception on POWER5, in fact the firmware
returns an error.  Due to this just remove the warning.

Also now that we have proper runlatch support we can remove the bootup
hack.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Anton Blanchard authored and Linus Torvalds committed Jul 8, 2005
1 parent b6bff39 commit 059e277
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions arch/ppc64/kernel/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ void ppc64_enable_pmcs(void)
unsigned long hid0;
#ifdef CONFIG_PPC_PSERIES
unsigned long set, reset;
int ret;
#endif /* CONFIG_PPC_PSERIES */

/* Only need to enable them once */
Expand Down Expand Up @@ -145,11 +144,7 @@ void ppc64_enable_pmcs(void)
case PLATFORM_PSERIES_LPAR:
set = 1UL << 63;
reset = 0;
ret = plpar_hcall_norets(H_PERFMON, set, reset);
if (ret)
printk(KERN_ERR "H_PERFMON call on cpu %u "
"returned %d\n",
smp_processor_id(), ret);
plpar_hcall_norets(H_PERFMON, set, reset);
break;
#endif /* CONFIG_PPC_PSERIES */

Expand All @@ -161,13 +156,6 @@ void ppc64_enable_pmcs(void)
/* instruct hypervisor to maintain PMCs */
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR)
get_paca()->lppaca.pmcregs_in_use = 1;

/*
* On SMT machines we have to set the run latch in the ctrl register
* in order to make PMC6 spin.
*/
if (cpu_has_feature(CPU_FTR_SMT))
ppc64_runlatch_on();
#endif /* CONFIG_PPC_PSERIES */
}

Expand Down

0 comments on commit 059e277

Please sign in to comment.