summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2016-04-18 10:45:32 (GMT)
committerMichael Ellerman <mpe@ellerman.id.au>2016-04-18 10:45:32 (GMT)
commit8404410b296095c78ed63f163ac5d417ff0647dd (patch)
tree542fcea7d106a8fd608c47da1a8c88255f3e2c5f /include
parent1050e689a63baffdadcd33498c15d859922504c0 (diff)
parent85baa095497f3e590df9f6c8932121f123efca5c (diff)
downloadlinux-8404410b296095c78ed63f163ac5d417ff0647dd.tar.xz
Merge branch 'topic/livepatch' into next
Merge the support for live patching on ppc64le using mprofile-kernel. This branch has also been merged into the livepatching tree for v4.7.
Diffstat (limited to 'include')
-rw-r--r--include/linux/ftrace.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index dea12a6..66a36a8 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -455,6 +455,7 @@ int ftrace_update_record(struct dyn_ftrace *rec, int enable);
int ftrace_test_record(struct dyn_ftrace *rec, int enable);
void ftrace_run_stop_machine(int command);
unsigned long ftrace_location(unsigned long ip);
+unsigned long ftrace_location_range(unsigned long start, unsigned long end);
unsigned long ftrace_get_addr_new(struct dyn_ftrace *rec);
unsigned long ftrace_get_addr_curr(struct dyn_ftrace *rec);