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

Commit 12922110 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

tracing/power: move the power trace headers to a dedicated file 



Impact: cleanup

Move the power tracer headers to trace/power.h to keep ftrace.h and power bits
more easy to maintain as separated topics.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7447dce9

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/cpufreq.h>

#include <linux/compiler.h>

#include <linux/dmi.h>

#include <linux/ftrace.h>

#include <trace/power.h>



#include <linux/acpi.h>

#include <acpi/processor.h>

arch/x86/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <linux/module.h>

#include <linux/pm.h>

#include <linux/clockchips.h>

#include <linux/ftrace.h>

#include <trace/power.h>

#include <asm/system.h>

#include <asm/apic.h>

include/linux/ftrace.h

+0 −30
Original line number Diff line number Diff line
@@ -339,36 +339,6 @@ ftrace_init_module(struct module *mod, 
		   unsigned long *start, unsigned long *end) { }

#endif



enum {

	POWER_NONE = 0,

	POWER_CSTATE = 1,

	POWER_PSTATE = 2,

};



struct power_trace {

#ifdef CONFIG_POWER_TRACER

	ktime_t			stamp;

	ktime_t			end;

	int			type;

	int			state;

#endif

};



#ifdef CONFIG_POWER_TRACER

extern void trace_power_start(struct power_trace *it, unsigned int type,

					unsigned int state);

extern void trace_power_mark(struct power_trace *it, unsigned int type,

					unsigned int state);

extern void trace_power_end(struct power_trace *it);

#else

static inline void trace_power_start(struct power_trace *it, unsigned int type,

					unsigned int state) { }

static inline void trace_power_mark(struct power_trace *it, unsigned int type,

					unsigned int state) { }

static inline void trace_power_end(struct power_trace *it) { }

#endif





/*

 * Structure that defines an entry function trace.

 */

include/trace/power.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
#ifndef _TRACE_POWER_H

#define _TRACE_POWER_H



#include <linux/ktime.h>



enum {

	POWER_NONE = 0,

	POWER_CSTATE = 1,

	POWER_PSTATE = 2,

};



struct power_trace {

#ifdef CONFIG_POWER_TRACER

	ktime_t			stamp;

	ktime_t			end;

	int			type;

	int			state;

#endif

};



#ifdef CONFIG_POWER_TRACER

extern void trace_power_start(struct power_trace *it, unsigned int type,

					unsigned int state);

extern void trace_power_mark(struct power_trace *it, unsigned int type,

					unsigned int state);

extern void trace_power_end(struct power_trace *it);

#else

static inline void trace_power_start(struct power_trace *it, unsigned int type,

					unsigned int state) { }

static inline void trace_power_mark(struct power_trace *it, unsigned int type,

					unsigned int state) { }

static inline void trace_power_end(struct power_trace *it) { }

#endif



#endif /* _TRACE_POWER_H */

kernel/trace/trace.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/ftrace.h>

#include <trace/boot.h>

#include <trace/kmemtrace.h>

#include <trace/power.h>



enum trace_type {

	__TRACE_FIRST_TYPE = 0,