diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 17:25:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 17:25:59 -0400 |
| commit | ac3f482236793c75caae2c2ebb3f3e5f8b7393e1 (patch) | |
| tree | f769225f9a77ae1e026b18d3d9260f5e5aefe99d /drivers | |
| parent | 85be928c4101670f99cdd7c927798aa4dcbb3168 (diff) | |
| parent | f39d1b9792881ce4eb982ec8cc65258bf95674b5 (diff) | |
Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
dma-debug: Fix the overlap() function to be correct and readable
oprofile: reset bt_lost_no_mapping with other stats
x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon
signals: declare sys_rt_tgsigqueueinfo in syscalls.h
rcu: Mark Hierarchical RCU no longer experimental
dma-debug: Put all hash-chain locks into the same lock class
dma-debug: fix off-by-one error in overlap function
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/oprofile/oprofile_stats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c index e1f6ce03705e..3c2270a8300c 100644 --- a/drivers/oprofile/oprofile_stats.c +++ b/drivers/oprofile/oprofile_stats.c | |||
| @@ -33,6 +33,7 @@ void oprofile_reset_stats(void) | |||
| 33 | atomic_set(&oprofile_stats.sample_lost_no_mm, 0); | 33 | atomic_set(&oprofile_stats.sample_lost_no_mm, 0); |
| 34 | atomic_set(&oprofile_stats.sample_lost_no_mapping, 0); | 34 | atomic_set(&oprofile_stats.sample_lost_no_mapping, 0); |
| 35 | atomic_set(&oprofile_stats.event_lost_overflow, 0); | 35 | atomic_set(&oprofile_stats.event_lost_overflow, 0); |
| 36 | atomic_set(&oprofile_stats.bt_lost_no_mapping, 0); | ||
| 36 | } | 37 | } |
| 37 | 38 | ||
| 38 | 39 | ||