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

Commit 16097439 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core

parents 40ada30f 0012693a

arch/x86/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
		return;

	}



	calltime = cpu_clock(raw_smp_processor_id());

	calltime = trace_clock_local();



	if (ftrace_push_return_trace(old, calltime,

				self_addr, &trace.depth) == -EBUSY) {

include/linux/ftrace.h

+7 −6
Original line number Diff line number Diff line 
#ifndef _LINUX_FTRACE_H

#define _LINUX_FTRACE_H



#include <linux/linkage.h>

#include <linux/fs.h>

#include <linux/ktime.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/module.h>

#include <linux/trace_clock.h>

#include <linux/kallsyms.h>

#include <linux/linkage.h>

#include <linux/bitops.h>

#include <linux/module.h>

#include <linux/ktime.h>

#include <linux/sched.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/fs.h>



#include <asm/ftrace.h>

kernel/trace/trace_functions_graph.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ unsigned long ftrace_return_to_handler(void) 
	unsigned long ret;



	ftrace_pop_return_trace(&trace, &ret);

	trace.rettime = cpu_clock(raw_smp_processor_id());

	trace.rettime = trace_clock_local();

	ftrace_graph_return(&trace);



	if (unlikely(!ret)) {