projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/da721...
[cascardo/linux.git]
/
include
/
linux
/
perf_event.h
diff --git
a/include/linux/perf_event.h
b/include/linux/perf_event.h
index
8ed4326
..
2b6b43c
100644
(file)
--- a/
include/linux/perf_event.h
+++ b/
include/linux/perf_event.h
@@
-743,7
+743,9
@@
struct perf_event_context {
u64 parent_gen;
u64 generation;
int pin_count;
u64 parent_gen;
u64 generation;
int pin_count;
+#ifdef CONFIG_CGROUP_PERF
int nr_cgroups; /* cgroup evts */
int nr_cgroups; /* cgroup evts */
+#endif
void *task_ctx_data; /* pmu specific data */
struct rcu_head rcu_head;
};
void *task_ctx_data; /* pmu specific data */
struct rcu_head rcu_head;
};
@@
-769,7
+771,9
@@
struct perf_cpu_context {
unsigned int hrtimer_active;
struct pmu *unique_pmu;
unsigned int hrtimer_active;
struct pmu *unique_pmu;
+#ifdef CONFIG_CGROUP_PERF
struct perf_cgroup *cgrp;
struct perf_cgroup *cgrp;
+#endif
};
struct perf_output_handle {
};
struct perf_output_handle {