Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36

[firefly-linux-kernel-4.4.55.git] / include / linux / perf_event.h

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 716f99b682c1a57fb3b6f1f72e90aec3982ca5fd..1d42c6ecd00a3d0b885c84f36e0c38dca976eee4 100644 (file)
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -788,6 +788,7 @@ struct perf_event_context {
        int                             nr_active;
        int                             is_active;
        int                             nr_stat;
+       int                             rotate_disable;
        atomic_t                        refcount;
        struct task_struct              *task;