Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 877c6856 authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

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: default avatarLi 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: default avatarIngo Molnar <mingo@kernel.org>
parent 6dbe51c2

include/linux/perf_event.h

+1 −17
Original line number Diff line number Diff line
@@ -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;



/**

kernel/events/core.c

+15 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/ftrace_event.h>

#include <linux/hw_breakpoint.h>

#include <linux/mm_types.h>

#include <linux/cgroup.h>



#include "internal.h"
@@ -233,6 +234,20 @@ static void perf_ctx_unlock(struct perf_cpu_context *cpuctx, 


#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;

};



/*

 * Must ensure cgroup is pinned (css_get) before calling

 * this function. In other words, we cannot call this function