diff --git a/[refs] b/[refs]
index d3bdcf337793..f1d86c63e7bf 100644
--- 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
index 6e133954e2e4..7c4f32f6ae1a 100644
--- 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);