3 files changed, 16 insertions, 19 deletions

diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 1b2be63c8528..772a43fea825 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -179,21 +179,6 @@ put_callchain_entry(int rctx)
 }
 
 struct perf_callchain_entry *
-perf_callchain(struct perf_event *event, struct pt_regs *regs)
-{
-        bool kernel = !event->attr.exclude_callchain_kernel;
-        bool user   = !event->attr.exclude_callchain_user;
-        /* Disallow cross-task user callchains. */
-        bool crosstask = event->ctx->task && event->ctx->task != current;
-        const u32 max_stack = event->attr.sample_max_stack;
-
-        if (!kernel && !user)
-                return NULL;
-
-        return get_perf_callchain(regs, 0, kernel, user, max_stack, crosstask, true);
-}
-
-struct perf_callchain_entry *
 get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user,
                    u32 max_stack, bool crosstask, bool add_mark)
 {
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 55fb648a32b0..5fc1ded4b450 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5980,6 +5980,22 @@ static u64 perf_virt_to_phys(u64 virt)
         return phys_addr;
 }
 
+static struct perf_callchain_entry *
+perf_callchain(struct perf_event *event, struct pt_regs *regs)
+{
+        bool kernel = !event->attr.exclude_callchain_kernel;
+        bool user   = !event->attr.exclude_callchain_user;
+        /* Disallow cross-task user callchains. */
+        bool crosstask = event->ctx->task && event->ctx->task != current;
+        const u32 max_stack = event->attr.sample_max_stack;
+
+        if (!kernel && !user)
+                return NULL;
+
+        return get_perf_callchain(regs, 0, kernel, user,
+                                  max_stack, crosstask, true);
+}
+
 void perf_prepare_sample(struct perf_event_header *header,
                          struct perf_sample_data *data,
                          struct perf_event *event,
diff --git a/kernel/events/internal.h b/kernel/events/internal.h
index 09b1537ae06c..6dc725a7e7bc 100644
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
@@ -201,10 +201,6 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
 
 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);
-
 static inline int get_recursion_context(int *recursion)
 {
         int rctx;