rpms/kernel/devel/configs config-x86-generic, 1.85, 1.86 config-x86_64-generic, 1.67, 1.68

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv9098/configs

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
* Fri Apr 13 2007 Dave Jones <davej at redhat.com>
- Make NMI timeout a config option.



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- config-x86-generic	30 Mar 2007 06:03:16 -0000	1.85
+++ config-x86-generic	13 Apr 2007 20:40:51 -0000	1.86
@@ -211,8 +211,8 @@
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_4KSTACKS=y
+CONFIG_DEBUG_NMI_TIMEOUT=5
 
-# FIXME: Disable before release.
 # CONFIG_DEBUG_PAGEALLOC is not set
 
 CONFIG_PCI_DIRECT=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- config-x86_64-generic	12 Mar 2007 23:55:08 -0000	1.67
+++ config-x86_64-generic	13 Apr 2007 20:40:51 -0000	1.68
@@ -174,6 +174,7 @@
 
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_NMI_TIMEOUT=5
 
 CONFIG_PC8736x_GPIO=m