Merge commit 'v2.6.32-rc6' into perf/core
[linux-3.10.git] / include / linux / perf_event.h
index df9d964..45b56fa 100644 (file)
@@ -472,8 +472,8 @@ struct hw_perf_event {
                        unsigned long   event_base;
                        int             idx;
                };
-               union { /* software */
-                       atomic64_t      count;
+               struct { /* software */
+                       s64             remaining;
                        struct hrtimer  hrtimer;
                };
        };