summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/perfmon.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-03-21 08:16:21 -0800
committerTony Luck <tony.luck@intel.com>2006-03-21 08:16:21 -0800
commit536ea4e4198eeaa5a73fb734ea675e621609bb7e (patch)
tree321384a2233413d7df5f00b3356116c8b05ef08d /arch/ia64/kernel/perfmon.c
parent7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff)
parentb88e926584bf100bc23f5e76b7b674d4257edcb0 (diff)
downloadkernel-crypto-536ea4e4198eeaa5a73fb734ea675e621609bb7e.tar.gz
kernel-crypto-536ea4e4198eeaa5a73fb734ea675e621609bb7e.tar.xz
kernel-crypto-536ea4e4198eeaa5a73fb734ea675e621609bb7e.zip
Pull bsp-removal into release branch
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
-rw-r--r--arch/ia64/kernel/perfmon.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 9c5194b385d..077f21216b6 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -6722,6 +6722,7 @@ __initcall(pfm_init);
void
pfm_init_percpu (void)
{
+ static int first_time=1;
/*
* make sure no measurement is active
* (may inherit programmed PMCs from EFI).
@@ -6734,8 +6735,10 @@ pfm_init_percpu (void)
*/
pfm_unfreeze_pmu();
- if (smp_processor_id() == 0)
+ if (first_time) {
register_percpu_irq(IA64_PERFMON_VECTOR, &perfmon_irqaction);
+ first_time=0;
+ }
ia64_setreg(_IA64_REG_CR_PMV, IA64_PERFMON_VECTOR);
ia64_srlz_d();