From db55275f63db309068305cb6fc72b3079930534b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2011 21:07:40 -0700
Subject: [PATCH] --- yaml --- r: 250103 b: refs/heads/master c:
 5f2e8e2b0bf0f3a1819b25f6117a7f20bd15521d h: refs/heads/master i:   250101:
 4d8778370b577f8cf5bdbaa47521cb476f755a1d   250099:
 1c96f822edd851a3e55d52a844140865858a42ab   250095:
 3597784b8d4921aac34ba655aa8b9e58fc25afc4 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/watchdog.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b7bf03b55bc..90f94049ef13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e152b4c9e0fce6149c74406346a7ae7e7a17727
+refs/heads/master: 5f2e8e2b0bf0f3a1819b25f6117a7f20bd15521d
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
index 6e63097fa73a..7daa4b072e9f 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/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;
 }