diff -urN linux-2.6.9/arch/i386/defconfig linux-2.6.9-stk16/arch/i386/defconfig
--- linux-2.6.9/arch/i386/defconfig	2004-10-18 17:54:38.000000000 -0400
+++ linux-2.6.9-stk16/arch/i386/defconfig	2004-10-22 07:33:48.000000000 -0400
@@ -1221,7 +1221,8 @@
 CONFIG_EARLY_PRINTK=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_FRAME_POINTER is not set
-CONFIG_4KSTACKS=y
+# CONFIG_4KSTACKS=y is not set
+CONFIG_16KSTACKS=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 
diff -urN linux-2.6.9/arch/i386/Kconfig.debug linux-2.6.9-stk16/arch/i386/Kconfig.debug
--- linux-2.6.9/arch/i386/Kconfig.debug	2004-10-18 17:54:08.000000000 -0400
+++ linux-2.6.9-stk16/arch/i386/Kconfig.debug	2004-10-22 07:32:31.000000000 -0400
@@ -55,6 +55,13 @@
 	  on the VM subsystem for higher order allocations. This option
 	  will also use IRQ stacks to compensate for the reduced stackspace.
 
+config 16KSTACKS
+	bool "Use 16Kb for kernel stacks instead of 8Kb"
+	help
+	  If you say Y here the kernel will use a 16Kb stacksize for the
+	  kernel stack attached to each process/thread. This option
+	  will also use IRQ stacks to compensate for the reduced stackspace.
+
 config SCHEDSTATS
 	bool "Collect scheduler statistics"
 	depends on DEBUG_KERNEL && PROC_FS
diff -urN linux-2.6.9/arch/i386/kernel/irq.c linux-2.6.9-stk16/arch/i386/kernel/irq.c
--- linux-2.6.9/arch/i386/kernel/irq.c	2004-10-18 17:53:11.000000000 -0400
+++ linux-2.6.9-stk16/arch/i386/kernel/irq.c	2004-10-22 07:20:57.000000000 -0400
@@ -76,7 +76,7 @@
 /*
  * per-CPU IRQ handling stacks
  */
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
 union irq_ctx *hardirq_ctx[NR_CPUS];
 union irq_ctx *softirq_ctx[NR_CPUS];
 #endif
@@ -489,7 +489,7 @@
 	 * useful for irq hardware that does not mask cleanly in an
 	 * SMP environment.
 	 */
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
 
 	for (;;) {
 		irqreturn_t action_ret;
@@ -1077,7 +1077,7 @@
 }
 
 
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
 /*
  * These should really be __section__(".bss.page_aligned") as well, but
  * gcc's 3.0 and earlier don't handle that correctly.
diff -urN linux-2.6.9/include/asm-i386/irq.h linux-2.6.9-stk16/include/asm-i386/irq.h
--- linux-2.6.9/include/asm-i386/irq.h	2004-10-18 17:54:38.000000000 -0400
+++ linux-2.6.9-stk16/include/asm-i386/irq.h	2004-10-22 07:20:57.000000000 -0400
@@ -31,7 +31,7 @@
 #define ARCH_HAS_NMI_WATCHDOG		/* See include/linux/nmi.h */
 #endif
 
-#ifdef CONFIG_4KSTACKS
+#if defined(CONFIG_4KSTACKS) || defined(CONFIG_16KSTACKS)
 /*
  * per-CPU IRQ handling contexts (thread information and stack)
  */
diff -urN linux-2.6.9/include/asm-i386/module.h linux-2.6.9-stk16/include/asm-i386/module.h
--- linux-2.6.9/include/asm-i386/module.h	2004-10-18 17:53:21.000000000 -0400
+++ linux-2.6.9-stk16/include/asm-i386/module.h	2004-10-22 07:20:57.000000000 -0400
@@ -63,8 +63,12 @@
 #ifdef CONFIG_4KSTACKS
 #define MODULE_STACKSIZE "4KSTACKS "
 #else
+#ifdef CONFIG_16KSTACKS
+#define MODULE_STACKSIZE "16KSTACKS "
+#else
 #define MODULE_STACKSIZE ""
 #endif
+#endif
 
 #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_REGPARM MODULE_STACKSIZE
 
diff -urN linux-2.6.9/include/asm-i386/thread_info.h linux-2.6.9-stk16/include/asm-i386/thread_info.h
--- linux-2.6.9/include/asm-i386/thread_info.h	2004-10-18 17:53:21.000000000 -0400
+++ linux-2.6.9-stk16/include/asm-i386/thread_info.h	2004-10-22 07:20:57.000000000 -0400
@@ -55,8 +55,12 @@
 #ifdef CONFIG_4KSTACKS
 #define THREAD_SIZE            (4096)
 #else
+#ifdef CONFIG_16KSTACKS
+#define THREAD_SIZE		(16384)
+#else
 #define THREAD_SIZE		(8192)
 #endif
+#endif
 
 #define STACK_WARN             (THREAD_SIZE/8)
 /*