From 3b0d949f65a6f447fb68178f2ceaedee4a32ac54 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 12 May 2008 21:21:14 +0200
Subject: [PATCH] --- yaml --- r: 105188 b: refs/heads/master c:
 1c4cd6dd1d0fd3057bb6b8c87460049497889d1b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9cd2025eac52..759f05ffdc3a 100644
--- 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
index 31c19a79738d..a829dc8d7a9e 100644
--- 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