diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 06:07:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 06:07:40 +0200 |
| commit | 5f2e8e2b0bf0f3a1819b25f6117a7f20bd15521d (patch) | |
| tree | f7188c9376072d0ad37ae06832a2554dec320c67 | |
| parent | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb... (diff) | |
| download | linux-5f2e8e2b0bf0f3a1819b25f6117a7f20bd15521d.tar.xz linux-5f2e8e2b0bf0f3a1819b25f6117a7f20bd15521d.zip | |
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>
| -rw-r--r-- | kernel/watchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 6e63097fa73a..7daa4b072e9f 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; } |