Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
This commit is contained in:
@@ -436,7 +436,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
calltime = cpu_clock(raw_smp_processor_id());
|
calltime = trace_clock_local();
|
||||||
|
|
||||||
if (ftrace_push_return_trace(old, calltime,
|
if (ftrace_push_return_trace(old, calltime,
|
||||||
self_addr, &trace.depth) == -EBUSY) {
|
self_addr, &trace.depth) == -EBUSY) {
|
||||||
|
@@ -1,15 +1,16 @@
|
|||||||
#ifndef _LINUX_FTRACE_H
|
#ifndef _LINUX_FTRACE_H
|
||||||
#define _LINUX_FTRACE_H
|
#define _LINUX_FTRACE_H
|
||||||
|
|
||||||
#include <linux/linkage.h>
|
#include <linux/trace_clock.h>
|
||||||
#include <linux/fs.h>
|
|
||||||
#include <linux/ktime.h>
|
|
||||||
#include <linux/init.h>
|
|
||||||
#include <linux/types.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/kallsyms.h>
|
#include <linux/kallsyms.h>
|
||||||
|
#include <linux/linkage.h>
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/ktime.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
|
#include <linux/types.h>
|
||||||
|
#include <linux/init.h>
|
||||||
|
#include <linux/fs.h>
|
||||||
|
|
||||||
#include <asm/ftrace.h>
|
#include <asm/ftrace.h>
|
||||||
|
|
||||||
|
@@ -112,7 +112,7 @@ unsigned long ftrace_return_to_handler(void)
|
|||||||
unsigned long ret;
|
unsigned long ret;
|
||||||
|
|
||||||
ftrace_pop_return_trace(&trace, &ret);
|
ftrace_pop_return_trace(&trace, &ret);
|
||||||
trace.rettime = cpu_clock(raw_smp_processor_id());
|
trace.rettime = trace_clock_local();
|
||||||
ftrace_graph_return(&trace);
|
ftrace_graph_return(&trace);
|
||||||
|
|
||||||
if (unlikely(!ret)) {
|
if (unlikely(!ret)) {
|
||||||
|
Reference in New Issue
Block a user