---

yaml --- r: 148652 b: refs/heads/master c: f1a3c97 h: refs/heads/master v: v3
git-mirror · Jun 12, 2009 · ba6693f · ba6693f
1 parent 3679a51
commit ba6693f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c921126fe553440261f56691c5f60fbaaa486d6
+refs/heads/master: f1a3c979059b2033d0b1cc4f9ee5c90bf92b5f94
diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h
@@ -621,7 +621,8 @@ extern int perf_counter_overflow(struct perf_counter *counter, int nmi,
 static inline int is_software_counter(struct perf_counter *counter)
 {
 	return (counter->attr.type != PERF_TYPE_RAW) &&
-		(counter->attr.type != PERF_TYPE_HARDWARE);
+		(counter->attr.type != PERF_TYPE_HARDWARE) &&
+		(counter->attr.type != PERF_TYPE_HW_CACHE);
 }
 
 extern void perf_swcounter_event(u32, u64, int, struct pt_regs *, u64);