---

yaml --- r: 250103 b: refs/heads/master c: 5f2e8e2 h: refs/heads/master i: 250101: 4d87783 250099: 1c96f82 250095: 3597784 v: v3
git-mirror · May 24, 2011 · db55275 · db55275
1 parent 1fd1e78
commit db55275
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }