Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / s390 / kernel / perf_event.c

diff --git a/arch/s390/kernel/perf_event.c b/arch/s390/kernel/perf_event.c
index 87035fa58bbe897a8e1234d44a60d3131c2ab343..17431f63de00279bbef1b1619ce3966f395c7e74 100644 (file)
--- a/arch/s390/kernel/perf_event.c
+++ b/arch/s390/kernel/perf_event.c
@@ -248,33 +248,3 @@ ssize_t cpumf_events_sysfs_show(struct device *dev,
        return sprintf(page, "event=0x%04llx,name=%s\n",
                       pmu_attr->id, attr->attr.name);
 }
-
-/* Reserve/release functions for sharing perf hardware */
-static DEFINE_SPINLOCK(perf_hw_owner_lock);
-static void *perf_sampling_owner;
-
-int perf_reserve_sampling(void)
-{
-       int err;
-
-       err = 0;
-       spin_lock(&perf_hw_owner_lock);
-       if (perf_sampling_owner) {
-               pr_warn("The sampling facility is already reserved by %p\n",
-                       perf_sampling_owner);
-               err = -EBUSY;
-       } else
-               perf_sampling_owner = __builtin_return_address(0);
-       spin_unlock(&perf_hw_owner_lock);
-       return err;
-}
-EXPORT_SYMBOL(perf_reserve_sampling);
-
-void perf_release_sampling(void)
-{
-       spin_lock(&perf_hw_owner_lock);
-       WARN_ON(!perf_sampling_owner);
-       perf_sampling_owner = NULL;
-       spin_unlock(&perf_hw_owner_lock);
-}
-EXPORT_SYMBOL(perf_release_sampling);