---

yaml --- r: 105188 b: refs/heads/master c: 1c4cd6d h: refs/heads/master v: v3
git-mirror · May 25, 2008 · 3b0d949 · 3b0d949
1 parent 8512db1
commit 3b0d949
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: 9383d9679056e6cc4e7ff70f31da945a268238f4
+refs/heads/master: 1c4cd6dd1d0fd3057bb6b8c87460049497889d1b
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
@@ -84,7 +84,7 @@ extern int latencytop_enabled;
 extern int sysctl_nr_open_min, sysctl_nr_open_max;
 
 /* Constants used for minimum and  maximum */
-#ifdef CONFIG_HIGHMEM
+#if defined(CONFIG_HIGHMEM) || defined(CONFIG_DETECT_SOFTLOCKUP)
 static int one = 1;
 #endif