From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 04:07:40 +0000 (-0700)
Subject: kernel/watchdog.c: Use proper ANSI C prototypes
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5f2e8e2b0bf0;p=mv-sheeva.git

kernel/watchdog.c: Use proper ANSI C prototypes

We try to enforce it by using -Wstrict-prototypes, but apparently they
sometimes get through.  Introduced by 4eec42f39204 ("watchdog: Change
the default timeout and configure nmi watchdog period based").

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 6e63097fa73..7daa4b072e9 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -98,7 +98,7 @@ __setup("nosoftlockup", nosoftlockup_setup);
  * the thresholds with a factor: we make the soft threshold twice the amount of
  * time the hard threshold is.
  */
-static int get_softlockup_thresh()
+static int get_softlockup_thresh(void)
 {
 	return watchdog_thresh * 2;
 }