diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-11-15 05:05:18 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-11-15 05:05:18 -0500 |
commit | c23205c8488f11cb9ebe7a7b5851a1d8a0171011 (patch) | |
tree | 239dd82daddb1ce08b50ea9145d8f2a4685ebead /kernel | |
parent | 5d81e5cfb37a174e8ddc0413e2e70cdf05807ace (diff) | |
parent | de346b6949063aa040ef607943b072835294f4b3 (diff) |
Merge branch 'core' of git://amd64.org/linux/rric into perf/core
Diffstat (limited to 'kernel')
-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 8d9dea56c262..924338bb489c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
@@ -1322,6 +1322,7 @@ retry: | |||
1322 | } | 1322 | } |
1323 | raw_spin_unlock_irq(&ctx->lock); | 1323 | raw_spin_unlock_irq(&ctx->lock); |
1324 | } | 1324 | } |
1325 | EXPORT_SYMBOL_GPL(perf_event_disable); | ||
1325 | 1326 | ||
1326 | static void perf_set_shadow_time(struct perf_event *event, | 1327 | static void perf_set_shadow_time(struct perf_event *event, |
1327 | struct perf_event_context *ctx, | 1328 | struct perf_event_context *ctx, |
@@ -1806,6 +1807,7 @@ retry: | |||
1806 | out: | 1807 | out: |
1807 | raw_spin_unlock_irq(&ctx->lock); | 1808 | raw_spin_unlock_irq(&ctx->lock); |
1808 | } | 1809 | } |
1810 | EXPORT_SYMBOL_GPL(perf_event_enable); | ||
1809 | 1811 | ||
1810 | int perf_event_refresh(struct perf_event *event, int refresh) | 1812 | int perf_event_refresh(struct perf_event *event, int refresh) |
1811 | { | 1813 | { |