diff --git a/[refs] b/[refs] index a54707af611d..fe463ed43a42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e57cfcdac6badd846a1cd831de54a1359c2d1eea +refs/heads/master: 645e8cc0c9f01f07f384fd522b782e5e6ae9de18 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index b26cb03c1914..abe1ef47496c 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -3903,11 +3903,13 @@ int perf_swevent_get_recursion_context(int **recursion) return 0; } +EXPORT_SYMBOL_GPL(perf_swevent_get_recursion_context); void perf_swevent_put_recursion_context(int *recursion) { (*recursion)--; } +EXPORT_SYMBOL_GPL(perf_swevent_put_recursion_context); static void __do_perf_sw_event(enum perf_type_id type, u32 event_id, u64 nr, int nmi,