diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-11-15 11:05:18 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-11-15 11:05:18 +0100 |
commit | c23205c8488f11cb9ebe7a7b5851a1d8a0171011 (patch) | |
tree | 239dd82daddb1ce08b50ea9145d8f2a4685ebead /kernel/events | |
parent | 5d81e5cfb37a174e8ddc0413e2e70cdf05807ace (diff) | |
parent | de346b6949063aa040ef607943b072835294f4b3 (diff) | |
download | op-kernel-dev-c23205c8488f11cb9ebe7a7b5851a1d8a0171011.zip op-kernel-dev-c23205c8488f11cb9ebe7a7b5851a1d8a0171011.tar.gz |
Merge branch 'core' of git://amd64.org/linux/rric into perf/core
Diffstat (limited to 'kernel/events')
-rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 8d9dea5..924338b 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -1322,6 +1322,7 @@ retry: } raw_spin_unlock_irq(&ctx->lock); } +EXPORT_SYMBOL_GPL(perf_event_disable); static void perf_set_shadow_time(struct perf_event *event, struct perf_event_context *ctx, @@ -1806,6 +1807,7 @@ retry: out: raw_spin_unlock_irq(&ctx->lock); } +EXPORT_SYMBOL_GPL(perf_event_enable); int perf_event_refresh(struct perf_event *event, int refresh) { |