patch-2.4.25 linux-2.4.25/arch/ia64/kernel/perfmon.c
Next file: linux-2.4.25/arch/ia64/kernel/salinfo.c
Previous file: linux-2.4.25/arch/ia64/kernel/pci.c
Back to the patch index
Back to the overall index
- Lines: 20
- Date:
2004-02-18 05:36:30.000000000 -0800
- Orig file:
linux-2.4.24/arch/ia64/kernel/perfmon.c
- Orig date:
2003-11-28 10:26:19.000000000 -0800
diff -urN linux-2.4.24/arch/ia64/kernel/perfmon.c linux-2.4.25/arch/ia64/kernel/perfmon.c
@@ -1527,7 +1527,7 @@
* - system-wide session: PMCx.pm=1 (privileged monitor)
* - per-task : PMCx.pm=0 (user monitor)
*/
- if ((is_monitor || is_counting) && value != PMC_DFL_VAL(i) && PFM_CHECK_PMC_PM(ctx, cnum, value)) {
+ if ((is_monitor || is_counting) && value != PMC_DFL_VAL(cnum) && PFM_CHECK_PMC_PM(ctx, cnum, value)) {
DBprintk(("pmc%u pmc_pm=%ld fl_system=%d\n",
cnum,
PMC_PM(cnum, value),
@@ -4013,6 +4013,10 @@
if (CTX_INHERIT_MODE(ctx) == PFM_FL_INHERIT_ONCE) {
nctx->ctx_fl_inherit = PFM_FL_INHERIT_NONE;
DBprintk(("downgrading to INHERIT_NONE for [%d]\n", task->pid));
+ /*
+ * downgrade parent: once means only first child!
+ */
+ ctx->ctx_fl_inherit = PFM_FL_INHERIT_NONE;
}
/*
* task is not yet visible in the tasklist, so we do
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)