29c29
< __FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_mod.c 147708 2005-06-30 19:01:26Z jkoshy $");
---
> __FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_mod.c 147867 2005-07-09 17:29:36Z jkoshy $");
1327c1327
< if ((pm->pm_flags & PMC_F_IS_STALLED) == 0)
---
> if (pm->pm_stalled == 0)
1858c1858
< (pm->pm_flags & PMC_F_IS_STALLED) == 0) {
---
> pm->pm_stalled == 0) {
3398,3399c3398
< * Flush the per-owner log file and Write a user-entry to the
< * log file.
---
> * Write a user supplied value to the log file.
3476a3476
> pm->pm_stalled = 1;
3478d3477
< atomic_set_int(&pm->pm_flags, PMC_F_IS_STALLED);
3602,3604c3601,3603
< * If the NMI handler sets PMC_F_IS_STALLED on a PMC after the
< * check below, we'll end up processing the stalled PMC at the
< * next hardclock tick.
---
> * If the NMI handler sets the pm_stalled field of a PMC after
> * the check below, we'll end up processing the stalled PMC at
> * the next hardclock tick.
3611c3610
< (pm->pm_flags & PMC_F_IS_STALLED) == 0) /* !stalled */
---
> pm->pm_stalled == 0) /* !stalled */
3614c3613
< pm->pm_flags &= ~PMC_F_IS_STALLED;
---
> pm->pm_stalled = 0;
3736c3735
< /* Stopped the hardware only if it is actually on */
---
> /* Stop hardware only if it is actually running */
3738c3737
< (pm->pm_flags & PMC_F_IS_STALLED) == 0) {
---
> pm->pm_stalled == 0) {
3774c3773,3774
< if (pm->pm_flags & PMC_F_NEEDS_LOGFILE)
---
> if (pm->pm_flags & PMC_F_NEEDS_LOGFILE &&
> PMC_IS_COUNTING_MODE(PMC_TO_MODE(pm)))