diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 08:57:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 08:57:03 +0200 |
commit | 889fac6d67d46a5e781c08fb26fec9016db1c307 (patch) | |
tree | 7e01d04928f7ce343afff5b77ba13c2f3d083326 /kernel/events/internal.h | |
parent | Merge tag 'perf-core-for-mingo-20160401' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | Linux 4.6-rc3 (diff) | |
download | linux-889fac6d67d46a5e781c08fb26fec9016db1c307.tar.xz linux-889fac6d67d46a5e781c08fb26fec9016db1c307.zip |
Merge tag 'v4.6-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/internal.h')
-rw-r--r-- | kernel/events/internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/events/internal.h b/kernel/events/internal.h index 2d67327d9ad9..05f9f6d626df 100644 --- a/kernel/events/internal.h +++ b/kernel/events/internal.h @@ -190,8 +190,6 @@ DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user) /* Callchain handling */ extern struct perf_callchain_entry * perf_callchain(struct perf_event *event, struct pt_regs *regs); -extern int get_callchain_buffers(void); -extern void put_callchain_buffers(void); static inline int get_recursion_context(int *recursion) { |