From 3acdfd7a4a31709dbaf6cd700c76ae20a303122b Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Sun, 30 Oct 2011 15:17:12 +0100
Subject: [PATCH] --- yaml --- r: 272091 b: refs/heads/master c:
 e54aafa0c3bef84bfd39b4c713942ae7cdcfc58a h: refs/heads/master i:   272089:
 4b6725bf064d6b1e7daf65e0fd0632978ff17c2d   272087:
 a81f7eace0c758dafe78b5a8745260abdd5fe04f v: v3

---
 [refs]                               | 2 +-
 trunk/arch/s390/oprofile/hwsampler.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dd25e833529d..d565cddb4ac7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4736d968254d71eba6814b2234a4e63f40aca15
+refs/heads/master: e54aafa0c3bef84bfd39b4c713942ae7cdcfc58a
diff --git a/trunk/arch/s390/oprofile/hwsampler.c b/trunk/arch/s390/oprofile/hwsampler.c
index 4552ce40c81a..f43c0e4282af 100644
--- a/trunk/arch/s390/oprofile/hwsampler.c
+++ b/trunk/arch/s390/oprofile/hwsampler.c
@@ -994,7 +994,7 @@ int hwsampler_allocate(unsigned long sdbt, unsigned long sdb)
  *
  * Returns 0 on success, !0 on failure.
  */
-int hwsampler_deallocate()
+int hwsampler_deallocate(void)
 {
 	int rc;
 
@@ -1035,7 +1035,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;
@@ -1102,7 +1102,7 @@ int hwsampler_setup()
 	return rc;
 }
 
-int hwsampler_shutdown()
+int hwsampler_shutdown(void)
 {
 	int rc;
 
@@ -1203,7 +1203,7 @@ int hwsampler_start_all(unsigned long rate)
  *
  * 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;