Index: kernel.config
===================================================================
--- kernel.config	(revision 80d2bdbb59aff7f143abc484128e57a0c2b47e47)
+++ kernel.config	(revision b4cad8b234012f4ac6c23239284b926c9dd31cbd)
@@ -60,5 +60,5 @@
 
 # Deadlock detection support for spinlocks
-! [CONFIG_DEBUG=y] CONFIG_DEBUG_SPINLOCK (y/n)
+! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)
 
 ## Run-time configuration directives
Index: tools/config.py
===================================================================
--- tools/config.py	(revision 80d2bdbb59aff7f143abc484128e57a0c2b47e47)
+++ tools/config.py	(revision b4cad8b234012f4ac6c23239284b926c9dd31cbd)
@@ -277,19 +277,21 @@
         condval = res.group(3)
         if condname not in seen_vars:
-            raise RuntimeError("Variable %s not defined before being asked." %\
-                               condname)
-        if not defaults.has_key(condname):
+            varval = ''
+##             raise RuntimeError("Variable %s not defined before being asked." %\
+##                                condname)
+        elif not defaults.has_key(condname):
             raise RuntimeError("Condition var %s does not exist: %s" % \
                                (condname,text))
-
+        else:
+            varval = defaults[condname]
         if ctype == 'cnf':
-            if oper == '=' and  condval == defaults[condname]:
+            if oper == '=' and  condval == varval:
                 return True
-            if oper == '!=' and condval != defaults[condname]:
+            if oper == '!=' and condval != varval:
                 return True
         else:
-            if oper== '=' and condval != defaults[condname]:
+            if oper== '=' and condval != varval:
                 return False
-            if oper== '!=' and condval == defaults[condname]:
+            if oper== '!=' and condval == varval:
                 return False
     if ctype=='cnf':