diff -ru redhat/SOURCES/kernel-2.6.9-i686-hugemem.config redhat.fixed/SOURCES/kernel-2.6.9-i686-hugemem.config
--- redhat/SOURCES/kernel-2.6.9-i686-hugemem.config	2005-02-14 09:47:27.000000000 -0500
+++ redhat.fixed/SOURCES/kernel-2.6.9-i686-hugemem.config	2005-03-14 21:15:08.000000000 -0500
@@ -6,6 +6,8 @@
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_LOCALVERSION=""
 
+CONFIG_4KSTACKS=n
+
 #
 # Code maturity level options
 #
@@ -2077,7 +2079,7 @@
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
 CONFIG_JFS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
 # CONFIG_XFS_RT is not set
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -2387,7 +2389,6 @@
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SSCAPE is not set
 # CONFIG_REISERFS_FS is not set
-# CONFIG_XFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_EFS_FS is not set
Only in redhat/SOURCES: kernel-2.6.9-i686-hugemem.config.orig
Only in redhat/SOURCES: kernel-2.6.9-i686-hugemem.config.rej
diff -ru redhat/SOURCES/kernel-2.6.9-i686-smp.config redhat.fixed/SOURCES/kernel-2.6.9-i686-smp.config
--- redhat/SOURCES/kernel-2.6.9-i686-smp.config	2005-02-14 09:47:27.000000000 -0500
+++ redhat.fixed/SOURCES/kernel-2.6.9-i686-smp.config	2005-03-14 21:15:28.000000000 -0500
@@ -6,6 +6,8 @@
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_LOCALVERSION=""
 
+CONFIG_4KSTACKS=n
+
 #
 # Code maturity level options
 #
@@ -2077,7 +2079,7 @@
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
 CONFIG_JFS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
 # CONFIG_XFS_RT is not set
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -2387,7 +2389,6 @@
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SSCAPE is not set
 # CONFIG_REISERFS_FS is not set
-# CONFIG_XFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_EFS_FS is not set
Only in redhat/SOURCES: kernel-2.6.9-i686-smp.config.orig
Only in redhat/SOURCES: kernel-2.6.9-i686-smp.config.rej
diff -ru redhat/SOURCES/kernel-2.6.9-i686.config redhat.fixed/SOURCES/kernel-2.6.9-i686.config
--- redhat/SOURCES/kernel-2.6.9-i686.config	2005-02-14 09:47:27.000000000 -0500
+++ redhat.fixed/SOURCES/kernel-2.6.9-i686.config	2005-03-14 21:15:49.000000000 -0500
@@ -6,6 +6,8 @@
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_LOCALVERSION=""
 
+CONFIG_4KSTACKS=n
+
 #
 # Code maturity level options
 #
@@ -2077,7 +2079,7 @@
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
 CONFIG_JFS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
 # CONFIG_XFS_RT is not set
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -2387,7 +2389,6 @@
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SSCAPE is not set
 # CONFIG_REISERFS_FS is not set
-# CONFIG_XFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_EFS_FS is not set
Only in redhat/SOURCES: kernel-2.6.9-i686.config.orig
Only in redhat/SOURCES: kernel-2.6.9-i686.config.rej
diff -ru redhat/SPECS/kernel-2.6.spec redhat.fixed/SPECS/kernel-2.6.spec
--- redhat/SPECS/kernel-2.6.spec	2005-02-14 09:45:59.000000000 -0500
+++ redhat.fixed/SPECS/kernel-2.6.spec	2005-03-14 22:27:14.873277464 -0500
@@ -718,7 +718,8 @@
 #
 # x86(-64)
 #
-%patch200 -p1
+# this patch removes 4k stacks as an option
+# %patch200 -p1
 # fix x86_64 copy_user_generic
 %patch201 -p1
 # Share cache descriptors between x86/x86-64
@@ -1121,23 +1122,24 @@
 #
 # Various crash dumping patches
 #
-%patch1500 -p1
-%patch1510 -p1
-%patch1520 -p1
-%patch1530 -p1
-%patch1540 -p1
-%patch1541 -p1
-%patch1542 -p1
-%patch1543 -p1
-%patch1544 -p1
-%patch1545 -p1
-%patch1546 -p1
-%patch1547 -p1
-%patch1548 -p1
-%patch1549 -p1
-%patch1550 -p1
-%patch1551 -p1
-%patch1552 -p1
+# some/all of these assume 4kstacks
+#%patch1500 -p1
+#%patch1510 -p1
+#%patch1520 -p1
+#%patch1530 -p1
+#%patch1540 -p1
+#%patch1541 -p1
+#%patch1542 -p1
+#%patch1543 -p1
+#%patch1544 -p1
+#%patch1545 -p1
+#%patch1546 -p1
+#%patch1547 -p1
+#%patch1548 -p1
+#%patch1549 -p1
+#%patch1550 -p1
+#%patch1551 -p1
+#%patch1552 -p1
 
 #
 # Various SELinux fixes from 2.6.10rc