Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...

[~andy/linux] / arch / s390 / oprofile / hwsampler.c

diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index cab0fe932c08ea7b121b7ee13423b1ff2ac22495..9daee91e6c3fc20f8668a1797a8d388c102b62aa 100644 (file)
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -999,7 +999,7 @@ allocate_error:
  *
  * Returns 0 on success, !0 on failure.
  */
-int hwsampler_deallocate()
+int hwsampler_deallocate(void)
 {
        int rc;
 
@@ -1040,7 +1040,7 @@ unsigned long hwsampler_get_sample_overflow_count(unsigned int cpu)
        return cb->sample_overflow;
 }
 
-int hwsampler_setup()
+int hwsampler_setup(void)
 {
        int rc;
        int cpu;
@@ -1107,7 +1107,7 @@ setup_exit:
        return rc;
 }
 
-int hwsampler_shutdown()
+int hwsampler_shutdown(void)
 {
        int rc;
 
@@ -1208,7 +1208,7 @@ start_all_exit:
  *
  * Returns 0 on success, !0 on failure.
  */
-int hwsampler_stop_all()
+int hwsampler_stop_all(void)
 {
        int tmp_rc, rc, cpu;
        struct hws_cpu_buffer *cb;