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

Commit 5a209c2d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core

parents 3f8e402f 0c726da9 e270219f

kernel/profile.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = { 
};



#ifdef CONFIG_SMP

static void __init profile_nop(void *unused)

static inline void profile_nop(void *unused)

{

}

kernel/trace/trace.c

+0 −2
Original line number Diff line number Diff line
@@ -259,9 +259,7 @@ static const char *trace_options[] = { 
	"sched-tree",

	"ftrace_printk",

	"ftrace_preempt",

#ifdef CONFIG_BRANCH_TRACER

	"branch",

#endif

	"annotate",

	NULL

};

kernel/trace/trace.h

+0 −2
Original line number Diff line number Diff line
@@ -471,9 +471,7 @@ enum trace_iterator_flags { 
	TRACE_ITER_SCHED_TREE		= 0x200,

	TRACE_ITER_PRINTK		= 0x400,

	TRACE_ITER_PREEMPTONLY		= 0x800,

#ifdef CONFIG_BRANCH_TRACER

	TRACE_ITER_BRANCH		= 0x1000,

#endif

	TRACE_ITER_ANNOTATE		= 0x2000,

};