diff options
| author | Li Zefan <lizefan@huawei.com> | 2013-03-05 11:38:08 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-06 11:32:56 +0100 |
| commit | 877c685607925238e302cd3aa38788dca6c1b226 (patch) | |
| tree | 56159445dc66e409d5398a16c1ba01aad7e511e8 /include/linux/perf_event.h | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
| download | lwn-877c685607925238e302cd3aa38788dca6c1b226.tar.gz lwn-877c685607925238e302cd3aa38788dca6c1b226.zip | |
perf: Remove include of cgroup.h from perf_event.h
Move struct perf_cgroup_info and perf_cgroup to
kernel/perf/core.c, and then we can remove include of cgroup.h.
Signed-off-by: Li Zefan <lizefan@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/513568A0.6020804@huawei.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index e47ee462c2f2..8737e1cee8b2 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -21,7 +21,6 @@ */ #ifdef CONFIG_PERF_EVENTS -# include <linux/cgroup.h> # include <asm/perf_event.h> # include <asm/local64.h> #endif @@ -299,22 +298,7 @@ struct swevent_hlist { #define PERF_ATTACH_GROUP 0x02 #define PERF_ATTACH_TASK 0x04 -#ifdef CONFIG_CGROUP_PERF -/* - * perf_cgroup_info keeps track of time_enabled for a cgroup. - * This is a per-cpu dynamically allocated data structure. - */ -struct perf_cgroup_info { - u64 time; - u64 timestamp; -}; - -struct perf_cgroup { - struct cgroup_subsys_state css; - struct perf_cgroup_info *info; /* timing info, one per cpu */ -}; -#endif - +struct perf_cgroup; struct ring_buffer; /** |