Skip to content

L
linux
Commit bd2fdafa authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge http://lia64.bkbits.net/to-linus-2.5 

into home.osdl.org:/home/torvalds/v2.5/linux
parents 44ca5ad7 ba1b98db
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
arch/ia64/kernel/perfmon.c
View file @ bd2fdafa
...@@ -6000,7 +6000,7 @@ pfm_load_regs (struct task_struct *task) ...@@ -6000,7 +6000,7 @@ pfm_load_regs (struct task_struct *task)
/* /*
* will replay the PMU interrupt * will replay the PMU interrupt
*/ */
DRPINT(("perfmon: resend irq for [%d]\n", task->pid)); DPRINT(("perfmon: resend irq for [%d]\n", task->pid));
hw_resend_irq(NULL, IA64_PERFMON_VECTOR); hw_resend_irq(NULL, IA64_PERFMON_VECTOR);
#endif #endif
pfm_stats[smp_processor_id()].pfm_replay_ovfl_intr_count++; pfm_stats[smp_processor_id()].pfm_replay_ovfl_intr_count++;
...@@ -6144,7 +6144,7 @@ pfm_load_regs (struct task_struct *task) ...@@ -6144,7 +6144,7 @@ pfm_load_regs (struct task_struct *task)
/* /*
* will replay the PMU interrupt * will replay the PMU interrupt
*/ */
DRPINT(("perfmon: resend irq for [%d]\n", task->pid)); DPRINT(("perfmon: resend irq for [%d]\n", task->pid));
hw_resend_irq(NULL, IA64_PERFMON_VECTOR); hw_resend_irq(NULL, IA64_PERFMON_VECTOR);
#endif #endif
pfm_stats[smp_processor_id()].pfm_replay_ovfl_intr_count++; pfm_stats[smp_processor_id()].pfm_replay_ovfl_intr_count++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7