diff options
author | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-09-05 15:39:10 (GMT) |
---|---|---|
committer | J. German Rivera <German.Rivera@freescale.com> | 2013-09-05 15:39:10 (GMT) |
commit | d83e6ec78bf67be5f2470dfe80c201b4063b9e8d (patch) | |
tree | 833b382574e701f9245b3869937a79c38ddd07a6 | |
parent | 70c2c840d8ff41359aafd7f510144c235a32fce1 (diff) | |
parent | 10237e76ea72f661173cdfffc81d7d7a09022833 (diff) | |
download | linux-fsl-qoriq-d83e6ec78bf67be5f2470dfe80c201b4063b9e8d.tar.xz |
Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8
-rw-r--r-- | kernel/events/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 45f7b3e..9c7fd2b 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -633,6 +633,7 @@ void perf_pmu_disable(struct pmu *pmu) if (!(*count)++) pmu->pmu_disable(pmu); } +EXPORT_SYMBOL_GPL(perf_pmu_disable); void perf_pmu_enable(struct pmu *pmu) { @@ -640,6 +641,7 @@ void perf_pmu_enable(struct pmu *pmu) if (!--(*count)) pmu->pmu_enable(pmu); } +EXPORT_SYMBOL_GPL(perf_pmu_enable); static DEFINE_PER_CPU(struct list_head, rotation_list); @@ -3425,6 +3427,7 @@ void perf_event_update_userpage(struct perf_event *event) unlock: rcu_read_unlock(); } +EXPORT_SYMBOL_GPL(perf_event_update_userpage); static int perf_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { @@ -4934,6 +4937,7 @@ int perf_event_overflow(struct perf_event *event, { return __perf_event_overflow(event, 1, data, regs); } +EXPORT_SYMBOL_GPL(perf_event_overflow); /* * Generic software event infrastructure @@ -6052,6 +6056,7 @@ free_pdc: free_percpu(pmu->pmu_disable_count); goto unlock; } +EXPORT_SYMBOL_GPL(perf_pmu_register); void perf_pmu_unregister(struct pmu *pmu) { @@ -6073,6 +6078,7 @@ void perf_pmu_unregister(struct pmu *pmu) put_device(pmu->dev); free_pmu_context(pmu); } +EXPORT_SYMBOL_GPL(perf_pmu_unregister); struct pmu *perf_init_event(struct perf_event *event) { |