1 files changed, 20 insertions, 3 deletions

diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 04e1b6a85362..9ffe645d5989 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/oprofile.h>
+#include <linux/perf_event.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -67,6 +68,21 @@ module_param_call(cpu_type, set_cpu_type, NULL, NULL, 0);
 MODULE_PARM_DESC(cpu_type, "Force legacy basic mode sampling"
                            "(report cpu_type \"timer\"");
 
+static int __oprofile_hwsampler_start(void)
+{
+        int retval;
+
+        retval = hwsampler_allocate(oprofile_sdbt_blocks, oprofile_sdb_blocks);
+        if (retval)
+                return retval;
+
+        retval = hwsampler_start_all(oprofile_hw_interval);
+        if (retval)
+                hwsampler_deallocate();
+
+        return retval;
+}
+
 static int oprofile_hwsampler_start(void)
 {
         int retval;
@@ -76,13 +92,13 @@ static int oprofile_hwsampler_start(void)
         if (!hwsampler_running)
                 return timer_ops.start();
 
-        retval = hwsampler_allocate(oprofile_sdbt_blocks, oprofile_sdb_blocks);
+        retval = perf_reserve_sampling();
         if (retval)
                 return retval;
 
-        retval = hwsampler_start_all(oprofile_hw_interval);
+        retval = __oprofile_hwsampler_start();
         if (retval)
-                hwsampler_deallocate();
+                perf_release_sampling();
 
         return retval;
 }
@@ -96,6 +112,7 @@ static void oprofile_hwsampler_stop(void)
 
         hwsampler_stop_all();
         hwsampler_deallocate();
+        perf_release_sampling();
         return;
 }