Merge branch 'fix/misc' into topic/misc

Conflicts:
	sound/pci/hda/patch_realtek.c

1 files changed, 8 insertions, 3 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index c66b34f75ee..8fa71874113 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -814,9 +814,14 @@ extern int perf_event_overflow(struct perf_event *event, int nmi,
  */
 static inline int is_software_event(struct perf_event *event)
 {
-        return (event->attr.type != PERF_TYPE_RAW) &&
-                (event->attr.type != PERF_TYPE_HARDWARE) &&
-                (event->attr.type != PERF_TYPE_HW_CACHE);
+        switch (event->attr.type) {
+        case PERF_TYPE_SOFTWARE:
+        case PERF_TYPE_TRACEPOINT:
+        /* for now the breakpoint stuff also works as software event */
+        case PERF_TYPE_BREAKPOINT:
+                return 1;
+        }
+        return 0;
 }
 
 extern atomic_t perf_swevent_enabled[PERF_COUNT_SW_MAX];