X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fcpu%2Fperf_event.c;h=8bac4bbecb9b76c39e43e0e8e2a69f98d364521e;hb=47732d886385af769449022a02c7cf0ce45d8a5c;hp=3658de47900f9a921a0f8373db962e061d42db3a;hpb=90405aa02247c1a6313c33e2253f9fd2299ae60b;p=cascardo%2Flinux.git

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 3658de47900f..8bac4bbecb9b 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1551,7 +1551,7 @@ static void __init filter_events(struct attribute **attrs)
 }
 
 /* Merge two pointer arrays */
-static __init struct attribute **merge_attr(struct attribute **a, struct attribute **b)
+__init struct attribute **merge_attr(struct attribute **a, struct attribute **b)
 {
 	struct attribute **new;
 	int j, i;