kernel/watchdog.c: Use proper ANSI C prototypes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 04:07:40 +0000 (21:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 04:07:40 +0000 (21:07 -0700)
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>
kernel/watchdog.c

index 6e63097fa73a8082ebe189b35f367e837ee21bef..7daa4b072e9fca1cfcf8e2c0dbd3d0b7cbfb63bc 100644 (file)
@@ -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;
 }